diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 18:05:05 +0300 | 
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 18:05:05 +0300 | 
| commit | 033b04f3883a0cc9024f45b5e9a0d792cf6dbb77 (patch) | |
| tree | ac49627e31aabda8aaa4b21c74c5aee2b2ea46e8 /indra/llmessage | |
| parent | 07dc391ab76a8860d04bfb001cdc686cd576663d (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
#	indra/newview/llagentlistener.cpp
#	indra/newview/llcommanddispatcherlistener.cpp
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llworldmapview.cpp
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 846549b368..87fd5a154f 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -253,7 +253,9 @@ void LLAvatarNameCache::handleAvNameCacheSuccess(const LLSD &data, const LLSD &h          {              const LLUUID& agent_id = *it; -            LL_WARNS("AvNameCache") << "LLAvatarNameResponder::result " +            // If cap fails, response can contain a lot of names, +            // don't spam too much +            LL_DEBUGS("AvNameCache") << "LLAvatarNameResponder::result "                  << "failed id " << agent_id                  << LL_ENDL; @@ -272,7 +274,7 @@ void LLAvatarNameCache::handleAgentError(const LLUUID& agent_id)  	if (existing == mCache.end())      {          // there is no existing cache entry, so make a temporary name from legacy -        LL_WARNS("AvNameCache") << "LLAvatarNameCache get legacy for agent " +        LL_DEBUGS("AvNameCache") << "LLAvatarNameCache get legacy for agent "  								<< agent_id << LL_ENDL;          gCacheName->get(agent_id, false,  // legacy compatibility                          boost::bind(&LLAvatarNameCache::legacyNameFetch, _1, _2, _3)); | 
