From b5ec05f9d92ab258b19d298075c38cd7be14b067 Mon Sep 17 00:00:00 2001 From: Cinders Date: Sat, 28 Dec 2013 14:29:44 -0700 Subject: [PATCH] Revert SH-4050 which causes the avatar to be shoved into the ground under certain circumstances --- indra/llappearance/llavatarappearance.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 87cb66cfdb..96f0a2a866 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -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]) {