diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-25 15:20:41 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-25 15:20:41 -0400 |
| commit | 11f3e485e9c55aebfdc8bf092c1b1ee0609e7ae8 (patch) | |
| tree | b2332e2a252fd9ee10f561873f062ed639ecd112 /indra/llcharacter | |
| parent | 5574e3bbaa6f4b08030c07bc3fe973f2dcd8ac42 (diff) | |
SL-276 - two more bones, corresponding to foot bones for the hind limbs
Diffstat (limited to 'indra/llcharacter')
| -rwxr-xr-x | indra/llcharacter/lljoint.cpp | 4 | ||||
| -rwxr-xr-x | indra/llcharacter/lljoint.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp index 4d83b409a0..4812c46077 100755 --- a/indra/llcharacter/lljoint.cpp +++ b/indra/llcharacter/lljoint.cpp @@ -226,8 +226,8 @@ void LLJoint::setJointNum(S32 joint_num) mJointNum = joint_num; if (mJointNum + 2 >= LL_CHARACTER_MAX_ANIMATED_JOINTS) { - LL_INFOS() << "Does LL_CHARACTER_MAX_ANIMATED_JOINTS need to be increased?" << LL_ENDL; - LL_ERRS() << "joint_num " << joint_num << " too large for " << LL_CHARACTER_MAX_ANIMATED_JOINTS << LL_ENDL; + LL_INFOS() << "LL_CHARACTER_MAX_ANIMATED_JOINTS needs to be increased" << LL_ENDL; + LL_ERRS() << "joint_num " << joint_num << " + 2 is too large for " << LL_CHARACTER_MAX_ANIMATED_JOINTS << LL_ENDL; } } //----------------------------------------------------------------------------- diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index 2c1974e6e7..cc2f87ca20 100755 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -42,7 +42,7 @@ 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. -const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 184; // must be divisible by 4! +const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 188; // must be divisible by 4! const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110; // These should be higher than the joint_num of any |