summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2011-08-30 14:59:52 -0400
committerprep linden <prep@lindenlab.com>2011-08-30 14:59:52 -0400
commit5e5869c63a05e3d773fc4d19deaff171efa5014c (patch)
tree1e2eea0290417c2fccfda8cdfc27d79b00094063 /indra/newview
parentce869c2b51f55d2ad908dc805abb995bdea01195 (diff)
Fix for Sh-2350
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 80db002f0e..0f0f593749 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2204,7 +2204,15 @@ void LLModelLoader::processJointToNodeMapping( domNode* pNode )
//Determine if the're any children wrt to this failed node.
//This occurs when an armature is exported and ends up being what essentially amounts to
//as the root for the visual_scene
- processChildJoints( pNode );
+ if ( pNode )
+ {
+ processChildJoints( pNode );
+ }
+ else
+ {
+ llinfos<<"Node is NULL"<<llendl;
+ }
+
}
}
//-----------------------------------------------------------------------------