summaryrefslogtreecommitdiff
path: root/indra/llmessage/llavatarnamecache.cpp
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-08 00:05:09 +0000
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-08 00:05:09 +0000
commit2eb03ae3ef1d75b0966b80a2cb370f5c4ef8973a (patch)
treeced9dc9ef8b2a329223eb94e374e90f2d4df3de7 /indra/llmessage/llavatarnamecache.cpp
parent096ea05a936d178ce0533708edab27708e9e718f (diff)
parent7b56db31f91545102744885b4f70c93278e837bd (diff)
Merge
Diffstat (limited to 'indra/llmessage/llavatarnamecache.cpp')
-rw-r--r--indra/llmessage/llavatarnamecache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 5a112b5432..abe0e46e5d 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -769,7 +769,7 @@ LLUUID LLAvatarNameCache::findIdByName(const std::string& name)
// Legacy method
LLUUID id;
- if (gCacheName->getUUID(name, id))
+ if (gCacheName && gCacheName->getUUID(name, id))
{
return id;
}