summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-06-29 09:41:06 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-06-29 09:41:06 -0400
commit5ebf9b3caeb95f6f196786c37847d409e94df415 (patch)
tree071bd14e260d53f74ece3aa23ec4f70327c21079 /indra/llcharacter
parent7f904fbcbd878b44b2ffe6c919e96c71756eece1 (diff)
SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for investigation
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/lljoint.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 6e6208a617..3c61047efc 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -402,6 +402,12 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
{
return;
}
+ // BENTO
+ // Not clear pelvis overrides are meaningful/useful.
+ //if (mName == "mPelvis")
+ //{
+ // return;
+ //}
if (!above_joint_pos_threshold(pos-getDefaultPosition()))
{
if (do_debug_joint(getName()))