livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert SH-4050 which causes the avatar to be shoved into the ground under certain circumstances

Cinders 2013-12-28 14:29:44 -07:00
parent f12db37580
commit b5ec05f9d9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llappearance/llavatarappearance.cpp
View File

@ -504,7 +504,9 @@ void LLAvatarAppearance::computeBodySize()
// Certain configurations of avatars can force the overall height (with offset) to go negative.
// Enforce a constraint to make sure we don't go below 0.1 meters.
// Camera positioning and other things start to break down when your avatar is "walking" while being fully underground
if (new_body_size.mV[VZ] + mAvatarOffset.mV[VZ] < 0.1f)
// [FS:CR] This is a bad check and will force your head in the ground if the following is true.
#if 0
if (new_body_size.mV[VZ] + mAvatarOffset.mV[VZ] < 0.1f)
{
mAvatarOffset.mV[VZ] = -(new_body_size.mV[VZ] - 0.11f); // avoid floating point rounding making the above check continue to fail.
@ -519,6 +521,7 @@ void LLAvatarAppearance::computeBodySize()
}
}
}
#endif // [/FS:CR]
if (new_body_size != mBodySize || old_offset != mAvatarOffset.mV[VZ])
{