diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2018-03-06 09:48:44 -0800 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2018-03-06 09:48:44 -0800 |
| commit | b9016f99f3abf8b135942e60a5a2d8cd8f0f4e75 (patch) | |
| tree | 7e0dc18306309254b5d8cd5f40ac6ce897409242 /indra/llmessage | |
| parent | f8134b152d1a7273e27a224eac11d52c0a6f94c9 (diff) | |
| parent | af9069edbff9df73cd75753b696aabd1ae8769b5 (diff) | |
Merged lindenlab/viewer-cougar into default
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 2 |
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; } |