summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Lihatskiy <andreylproductengine@lindenlab.com>2015-11-12 01:46:32 +0200
committerAndrey Lihatskiy <andreylproductengine@lindenlab.com>2015-11-12 01:46:32 +0200
commit2999933e4e0a7f48b697c05062543ba0e342c81e (patch)
treef9062be2f908ca5e95221182560fef4685deeb00
parent74bf67418dc7440afd1305ef8e0d157d3b5cb0f2 (diff)
parent080e26eba4f6f16eba6ac52727155720614da4ff (diff)
Merged lindenlab/viewer-lion into default
-rw-r--r--indra/llprimitive/lldaeloader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index d884c30d61..afc88fc861 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1605,9 +1605,9 @@ void LLDAELoader::processChildJoints( domNode* pParentNode )
//-----------------------------------------------------------------------------
bool LLDAELoader::isNodeAJoint( domNode* pNode )
{
- if ( !pNode )
+ if ( !pNode || !pNode->getName() )
{
- LL_INFOS()<<"Created node is NULL"<<LL_ENDL;
+ LL_INFOS()<<"Created node is NULL or invalid"<<LL_ENDL;
return false;
}