summaryrefslogtreecommitdiff
path: root/indra/llcharacter/lljoint.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-08-12 14:20:44 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-08-12 14:20:44 -0400
commit85a13b53f5570c44c476a7af70846874dfc3ecbf (patch)
tree69c5230d129510c7d5abcf54b718f9969c0a2831 /indra/llcharacter/lljoint.h
parent95d9e85f9539c449f37c438b90a90e6ac73d3b87 (diff)
MAINT-6631 - reluctantly, added support for animation of collision volumes, to avoid breaking existing content.
Diffstat (limited to 'indra/llcharacter/lljoint.h')
-rw-r--r--indra/llcharacter/lljoint.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h
index 2afdef1026..b2736f6c1e 100644
--- a/indra/llcharacter/lljoint.h
+++ b/indra/llcharacter/lljoint.h
@@ -40,9 +40,10 @@
#include "xform.h"
const S32 LL_CHARACTER_MAX_JOINTS_PER_MESH = 15;
-// 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!
+// Need to set this to count of animate-able joints,
+// currently = #bones + #collision_volumes + #attachments + 2,
+// rounded to next multiple of 4.
+const U32 LL_CHARACTER_MAX_ANIMATED_JOINTS = 216; // must be divisible by 4!
const U32 LL_MAX_JOINTS_PER_MESH_OBJECT = 110;
// These should be higher than the joint_num of any