summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2010-11-19 16:08:32 -0500
committerprep linden <prep@lindenlab.com>2010-11-19 16:08:32 -0500
commit292941ac947d0ef07431a3addcfbe72287031cc4 (patch)
tree15a81e259202a2a64c2fc2133e684ebf8ea1f406 /indra/newview
parent47a5f12ce05ed08aa9bc5599dfff9e4cf9b83e44 (diff)
Fix for crash on accessing a translation element that is NULL
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatermodelpreview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index d3da7533ec..142767529e 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1837,7 +1837,7 @@ void LLModelLoader::processJointNode( domNode* pNode, std::map<std::string,LLMat
{
//Translation via child from element
daeElement* pTranslateElement = getChildFromElement( pNode, "translate" );
- if ( pTranslateElement && pTranslateElement->typeID() != domTranslate::ID() )
+ if ( !pTranslateElement || pTranslateElement->typeID() != domTranslate::ID() )
{
llwarns<< "The found element is not a translate node" <<llendl;
}