summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-08-28 17:32:22 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-08-28 17:32:22 -0400
commit2cb14c7fdcf835816176d6edc0c05b99bcb39873 (patch)
tree197c837adbbf6933342415488ce5f9c09afa2d83 /indra/newview/llvovolume.cpp
parent33f66ac2344f996a2310b179173232b98c8bd026 (diff)
MAINT-4158 WIP - track position overrides requested by attachments so they can be undone intelligently
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rwxr-xr-xindra/newview/llvovolume.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 0ef48c4c70..0dc5ae5058 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4626,8 +4626,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
const LLVector3& jointPos = pSkinData->mAlternateBindMatrix[i].getTranslation();
//Set the joint position
- const std::string& attachment_name = drawablep->getVObj()->getAttachmentItemName();
- //pJoint->storeCurrentXform( jointPos );
+ const std::string& attachment_name = drawablep->getVObj()->getAttachmentItemName();
pJoint->addAttachmentPosOverride( jointPos, attachment_name );
//If joint is a pelvis then handle old/new pelvis to foot values