Skip to content
Snippets Groups Projects
Commit b42b0a9f authored by Brad Payne (Vir Linden)'s avatar Brad Payne (Vir Linden)
Browse files

MAINT-8554 - disabled joint position clamping for now

parent 86def988
No related branches found
No related tags found
No related merge requests found
...@@ -435,6 +435,7 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh ...@@ -435,6 +435,7 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
// return; // 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), 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[1],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET),
llclamp(pos[2],-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 ...@@ -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 " LL_DEBUGS("Avatar") << mesh_id << " joint " << getName() << " attachment pos override constrained to "
<< constrained_pos << " was " << pos << LL_ENDL; << constrained_pos << " was " << pos << LL_ENDL;
} }
#else
LLVector3 constrained_pos = pos;
#endif
LLVector3 before_pos; LLVector3 before_pos;
LLUUID before_mesh_id; LLUUID before_mesh_id;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment