Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decoupled rlva/setting based z-offset from param based z-offset. This reverts questionable changes introduced in the recent rlva merge.

Browse Source
This commit is contained in:
Shyotl
2013-03-27 01:36:23 -05:00
parent 60f1bada3d
commit 92cc65bf5e
7 changed files with 30 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/llvoavatarself.cpp
View File

@@ -3220,21 +3220,27 @@ void LLVOAvatarSelf::dumpWearableInfo(LLAPRFile& outfile)
apr_file_printf( file, "\n</wearable_info>\n" );
}
// [RLVa:KB] - Checked: 2013-03-03 (RLVa-1.4.8)
LLVector3 LLVOAvatarSelf::getAvatarOffset() /*const*/
extern bool on_pose_stand;
LLVector3 LLVOAvatarSelf::getLegacyAvatarOffset() const
{
if(isUsingServerBakes())
return LLAvatarAppearance::getAvatarOffset();
else
static LLCachedControl<F32> x_off("AscentAvatarXModifier");
static LLCachedControl<F32> y_off("AscentAvatarYModifier");
static LLCachedControl<F32> z_off("AscentAvatarZModifier");
LLVector3 offset(x_off,y_off,z_off);
// [RLVa:KB] Custom blah blah
if(rlv_handler_t::isEnabled())
{
static LLCachedControl<F32> x_off("AscentAvatarXModifier");
static LLCachedControl<F32> y_off("AscentAvatarYModifier");
static LLCachedControl<F32> z_off("AscentAvatarZModifier");
return LLVector3(x_off,y_off,z_off+RlvSettings::getAvatarOffsetZ());
F32 rlva_z_offs = RlvSettings::getAvatarOffsetZ();
if(fabs(rlva_z_offs) > F_APPROXIMATELY_ZERO)
offset.mV[VZ] = rlva_z_offs;
}
}
// [/RLVa:KB]
if(on_pose_stand)
offset.mV[VZ] += 7.5f;
return offset;
}
// static
void LLVOAvatarSelf::onChangeSelfInvisible(bool invisible)