diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-07-06 20:07:14 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-07-06 20:07:14 -0400 |
| commit | 4807d2745813d6f1490a45b7060ee5d434bd369e (patch) | |
| tree | 826e4edf9a38453768f1f080568435ba20c22389 /indra/llcharacter | |
| parent | 880fd82d0be58aa4cc5ea16518d15fed3178aa29 (diff) | |
| parent | fa4339f3c78b053f986997744b8b4a4808b79c3a (diff) | |
merge
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/lljoint.cpp | 6 | ||||
| -rw-r--r-- | indra/llcharacter/lljoint.h | 4 |
2 files changed, 8 insertions, 2 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())) diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 40e0a2749b..2afdef1026 100644 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -40,8 +40,8 @@ #include "xform.h" const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15; -// BENTO JOINT COUNT LIMIT - need to set this to final skeleton size -// (bones + attachments) + 2, rounded to next multiple of 4. +// Need to set this to count of animate-able joints (currently #bones + +// #attachments) + 2, rounded to next multiple of 4. const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 192; // must be divisible by 4! const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110; |