diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-09 19:40:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-09 19:40:58 -0500 |
| commit | a942a64b89f26fb2eda0aa6543856a35aa07e0c5 (patch) | |
| tree | aaa76bb6fedd4f9cbadf2edf119fc10c5a15419d /indra/newview/llvoavatar.cpp | |
| parent | d87d73e253e377141c97b907355f116bfb8fac46 (diff) | |
| parent | 54bf5d9de7e44a81ef86a420cfa285fdd9227abb (diff) | |
merge fixes for STORM-546
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]); |