summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-01-15 11:29:34 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-01-15 11:29:34 -0500
commita6c8de97bbb2609d24e212672b192650aed91e1e (patch)
tree8b5d9328745c853fcb1a28d44adc609150dd1b04 /indra/llprimitive
parent5c8d4e87ea3df383b72fafac8567f61a4f05cad8 (diff)
SL-302 WIP - handle the case that node name is NULL
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/llmodelloader.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodelloader.h b/indra/llprimitive/llmodelloader.h
index 568b3ead4e..9a042a4e30 100644
--- a/indra/llprimitive/llmodelloader.h
+++ b/indra/llprimitive/llmodelloader.h
@@ -179,7 +179,7 @@ public:
//-----------------------------------------------------------------------------
bool isNodeAJoint(const char* name)
{
- return mJointMap.find(name) != mJointMap.end();
+ return name != NULL && mJointMap.find(name) != mJointMap.end();
}
protected: