summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-04-20 13:18:56 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-04-20 13:18:56 -0400
commit0447fe5a57c2b3e0406fd28b665ea9f47d689b2f (patch)
treee8117a3d738c8f5490eb06c7987e3802e35bc5fa /indra/llprimitive
parentb092147a0be579e102c9210c6c99110862e9ad02 (diff)
SL-371 - increased the limit for StackWalker strings, avoid crashing if mesh has wrong number of mAlternateBindMatrix matrices
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/lldaeloader.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index df69607404..38b061dd79 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1189,7 +1189,7 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
S32 childCount = children.getCount();
//Process any children that are joints
- //Not all children are joints, some code be ambient lights, cameras, geometry etc..
+ //Not all children are joints, some could be ambient lights, cameras, geometry etc..
for (S32 i = 0; i < childCount; ++i)
{
domNode* pNode = daeSafeCast<domNode>(children[i]);
@@ -1229,6 +1229,8 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
domNode* pJoint = daeSafeCast<domNode>( resolver.getElement() );
if ( pJoint )
{
+ // FIXME this has a lot of overlap with processJointNode(), would be nice to refactor.
+
//Pull out the translate id and store it in the jointTranslations map
daeSIDResolver jointResolverA( pJoint, "./translate" );
domTranslate* pTranslateA = daeSafeCast<domTranslate>( jointResolverA.getElement() );