diff options
| author | callum_linden <none@none> | 2018-03-01 14:33:47 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-03-01 14:33:47 -0800 |
| commit | f4867d032dfe93b249eb188f071cb309e3a7b23e (patch) | |
| tree | 144bb92ed630302d1d68910069ad2505946eb471 /indra/llmessage/llavatarnamecache.cpp | |
| parent | 278382abd72a02b5e190cb259d2b4806f3908902 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
Automated merge with tip of 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; } |