summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-04-19 13:41:05 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-04-19 13:41:05 -0600
commite07d21639b9b004154bca8a7e3fbb5c4abb17d62 (patch)
tree4c0faf5afe93bc48780396744d729d2e6c033159
parentc494e5c0d55b2da2f5aa5ea18fbccb670b2f3107 (diff)
a try fix for SH-1307: Crash on selection of some meshes.
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index cdd2bcf8e3..c66b2255eb 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2164,7 +2164,7 @@ void LLModelLoader::loadTextures()
//-----------------------------------------------------------------------------
bool LLModelLoader::isNodeAJoint( domNode* pNode )
{
- if ( pNode->getName() == NULL)
+ if ( !pNode || pNode->getName() == NULL)
{
return false;
}