summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-15 16:58:35 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-15 16:58:35 -0500
commit7926c54a0bb72a77f56ff0a260edb166af979445 (patch)
tree3b67891f4bcf6bb14368d48c31df6fea0948cdd3
parent3f79aad1dfa7db5aafb359bcd531fb1ef03461c8 (diff)
SH-594 FIX: added check for nameless nodes
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index aa27381267..b85f3b3435 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1607,12 +1607,17 @@ void LLModelLoader::run()
bool LLModelLoader::isNodeAJoint( domNode* pNode )
{
+ if ( pNode->getName() == NULL)
+ {
+ return false;
+ }
+
if ( mJointMap.find( pNode->getName() ) != mJointMap.end() )
{
return true;
}
- return false;
+ return false;
}
void LLModelLoader::extractTranslation( domTranslate* pTranslate, LLMatrix4& transform )