diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-03-02 00:47:08 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-03-02 00:47:08 +0200 |
| commit | af9069edbff9df73cd75753b696aabd1ae8769b5 (patch) | |
| tree | 123661ba69903fccccb1501f97c05ce2c1c73411 /indra/llmessage/llavatarnamecache.cpp | |
| parent | 723e0b2e6bfa348e6270677b1745ad29311a19c1 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llmessage/llavatarnamecache.cpp')
| -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; } |