diff options
| author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-03-07 10:00:07 -0800 |
|---|---|---|
| committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-03-07 10:00:07 -0800 |
| commit | ac558e384214e22b4a8da2045854e2180b7428bf (patch) | |
| tree | 7de576ff5552cbb9956c6cdf0e4d84b52514316e /indra/llmessage | |
| parent | 485193c7f530fa3d8574c74304e452ab6d012e41 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
Merged lindenlab/viewer-release 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; } |