diff options
author | prep linden <prep@lindenlab.com> | 2011-03-17 17:25:52 -0400 |
---|---|---|
committer | prep linden <prep@lindenlab.com> | 2011-03-17 17:25:52 -0400 |
commit | 359d0494308451ce1318f0291ebbf0ba58e42f44 (patch) | |
tree | b9fce9d0ed9a2dd5dcf2c850ae914ff295ea2f29 /indra/newview/llvoavatar.cpp | |
parent | 4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (diff) |
Added support for handling an asset that contains a skeletal node which has no root node for the scene (yuck). Fix for an upload issue w/simplebot
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 5f0e4bcded..87a2c949b1 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6032,7 +6032,9 @@ void LLVOAvatar::cleanupAttachedMesh( LLViewerObject* pVO ) if ( pSkinData )
{
const int jointCnt = pSkinData->mJointNames.size();
- bool fullRig = ( jointCnt>=20 ) ? true : false;
+ //19 is a magic number derived from the master joint list
+ //TODO# move that joint list into the bone controller and query
+ bool fullRig = ( jointCnt>=19 ) ? true : false;
if ( fullRig )
{
const int bindCnt = pSkinData->mAlternateBindMatrix.size();
|