diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-12 12:24:15 -0800 |
commit | 187b21e6d22204e8989b1c7d5e75f8b7880dd79f (patch) | |
tree | 8f60e069433afa48fc9a20ecc165863a0108c1aa /indra/newview/llvoavatar.cpp | |
parent | e3677f9ee2223cc13d12456e1eee4f7f9a90c474 (diff) | |
parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) |
Merge latest from lindenlab/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 4e7ab97251..7ae1f672e8 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]); |