From b649847fe9f693b50b99cb73b7c641660812f5b7 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 24 Jun 2016 16:43:23 -0400 Subject: SL-124 - comment cleanup, fixed a crash if skinned mesh has no valid joint names defined --- indra/llcharacter/lljoint.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcharacter') 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; -- cgit v1.2.3 From 5ebf9b3caeb95f6f196786c37847d409e94df415 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 29 Jun 2016 09:41:06 -0400 Subject: SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for investigation --- indra/llcharacter/lljoint.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/llcharacter') 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())) -- cgit v1.2.3