diff options
| author | James Cook <james@lindenlab.com> | 2010-04-19 17:09:37 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-04-19 17:09:37 -0700 |
| commit | d373dc8782e7085e313b3637c168c87c2b5a71ed (patch) | |
| tree | 048c48a0507cc543fa5806cfa7b07df9d06873dc /indra/llmessage/llavatarnamecache.cpp | |
| parent | 16aa2a2a0f29fa927455e616817eef2bedbbf7a7 (diff) | |
Viewer asks login.cgi if the grid supports display names
If not, turns off display names. Cleaned up name cache reset code.
Alphabetized login auth param requests for easier merges going forward.
Diffstat (limited to 'indra/llmessage/llavatarnamecache.cpp')
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 62c2df90a9..69770c1f2a 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -34,7 +34,6 @@ #include "llavatarnamecache.h" -#include "llcachename.h" // *TODO: remove #include "llframetimer.h" #include "llhttpclient.h" #include "llsd.h" @@ -379,15 +378,13 @@ void LLAvatarNameCache::get(const LLUUID& agent_id, callback_slot_t slot) } -void LLAvatarNameCache::toggleDisplayNames() +void LLAvatarNameCache::setUseDisplayNames(bool use) { - sUseDisplayNames = !sUseDisplayNames; - // flush our cache - sCache.clear(); - // force re-lookups - if (gCacheName) + if (use != sUseDisplayNames) { - gCacheName->clear(); + sUseDisplayNames = use; + // flush our cache + sCache.clear(); } } |