From 292941ac947d0ef07431a3addcfbe72287031cc4 Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Fri, 19 Nov 2010 16:08:32 -0500
Subject: Fix for crash on accessing a translation element that is NULL
---
indra/newview/llfloatermodelpreview.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra')
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;
}
--
cgit v1.2.3