summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-05-14 14:15:10 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-05-14 14:15:10 +0100
commitb42b0a9fb9b9aa777c73729f3313a0f1584def86 (patch)
treec6c1cca2ed72b5d287f846ff72f310d2277645ea /indra/llcharacter
parent86def9880a59293b06fc1d5dd4a68ce0b85963c4 (diff)
MAINT-8554 - disabled joint position clamping for now
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/lljoint.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 9d10f53bed..07fcd99701 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -435,6 +435,7 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
// return;
//}
+#if 0 // AXON MAINT-8554 - this may be overly restrictive for large models
LLVector3 constrained_pos = LLVector3(llclamp(pos[0],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET),
llclamp(pos[1],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET),
llclamp(pos[2],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET));
@@ -443,6 +444,9 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
LL_DEBUGS("Avatar") << mesh_id << " joint " << getName() << " attachment pos override constrained to "
<< constrained_pos << " was " << pos << LL_ENDL;
}
+#else
+ LLVector3 constrained_pos = pos;
+#endif
LLVector3 before_pos;
LLUUID before_mesh_id;