diff options
| author | callum <none@none> | 2010-11-15 17:21:27 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-11-15 17:21:27 -0800 |
| commit | b4efcccce7438a72078c02dd404080d6dee37622 (patch) | |
| tree | 6d4890e3ace464bba7c81d3235ab799538080b02 /indra/newview/llvoavatar.cpp | |
| parent | a52e06d209925d1942230e8c129d8b19af7b88b5 (diff) | |
| parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) | |
Merge with tip of of viewer-development (http://hg.secondlife.com/viewer-development)
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 8738ad7687..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]); @@ -7864,6 +7864,7 @@ BOOL LLVOAvatar::LLVOAvatarXmlInfo::parseXmlMorphNodes(LLXmlTreeNode* root) //virtual void LLVOAvatar::updateRegion(LLViewerRegion *regionp) { + LLViewerObject::updateRegion(regionp); } std::string LLVOAvatar::getFullname() const |