diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-10 14:27:55 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-10 14:27:55 -0800 |
commit | 61fbc02deb08c1a69b8c24498fe559359496ac91 (patch) | |
tree | 4c50352704fde294cbbe05c34ff138552ef4147f /indra/newview/llvoavatar.cpp | |
parent | b5df1d2abcef04ee5f491a7414189f4e82faaa1e (diff) | |
parent | d7bca2b7b151969e45492e2ae244f50960fc4ddf (diff) |
STORM-105 : merge with viewer-development
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 8738ad7687..6f3aba29c6 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3992,7 +3992,7 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass) // *NOTE: this is disabled (there is no UI for enabling sShowFootPlane) due // to DEV-14477. the code is left here to aid in tracking down the cause // of the crash in the future. -brad - if (!gRenderForSelect && sShowFootPlane && mDrawable.notNull()) + if (sShowFootPlane && mDrawable.notNull()) { LLVector3 slaved_pos = mDrawable->getPositionAgent(); LLVector3 foot_plane_normal(mFootPlane.mV[VX], mFootPlane.mV[VY], mFootPlane.mV[VZ]); |