summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-03-01 19:38:21 -0500
committerNat Goodspeed <nat@lindenlab.com>2018-03-01 19:38:21 -0500
commit12ccb65603ec50ac80d85c4e023ec8e026c9e1f2 (patch)
treef7bfc4b64718278041f46e1759f5de27c9d83864 /indra/llmessage
parent2e87bac8f9983faa6a1e46ee626d688a101fa070 (diff)
parent3c7086d4fff6c370f8ce2be51cab2502f663aab1 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-451
Diffstat (limited to 'indra/llmessage')
-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;
}