diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-04-19 13:42:13 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-04-19 13:42:13 -0600 |
| commit | 25566075980d45c30ee25603d94454e081119210 (patch) | |
| tree | 5b0cd515e75c198eea874282cfda470ef7cab7c5 | |
| parent | 12b0b52b99e6f6a6538feba8589566d2f73f82c6 (diff) | |
| parent | e07d21639b9b004154bca8a7e3fbb5c4abb17d62 (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 2 |
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; } |