diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:12:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:12:04 -0500 |
| commit | 02d9734c456e7e7dce1aaa777ce34e4f714e6bad (patch) | |
| tree | ec85fd576ea6c4958f7bc87e8e035ef59f9b44fa | |
| parent | cd1871d2e39bfee8a6e5bc61ece40a764ff7cdb4 (diff) | |
| parent | def472b45cb17dd125f802dc3be85450135537a8 (diff) | |
merge back DRTVWR-275 from 3.4.4 beta
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 7 |
2 files changed, 4 insertions, 4 deletions
@@ -393,3 +393,4 @@ cd39255bd23330fd30c04105f2811e941d8524fe 3.4.4-beta2 35cfd4cf5b895fa776592f2e630e330be7f0604e DRTVWR-273 a36f1f354b02aa6e448ca13685de167d0a0a3d03 DRTVWR-272 37dba00ad820de3a808d4039396b162a9c275b3e DRTVWR-269 +c374035d459af3c03dea2dd90880dfc25de64706 DRTVWR-275 diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp index 700525e1fa..a6e2c89ba4 100644 --- a/indra/llmessage/llavatarnamecache.cpp +++ b/indra/llmessage/llavatarnamecache.cpp @@ -348,7 +348,7 @@ void LLAvatarNameCache::requestNamesViaCapability() while(!sAskQueue.empty()) { it = sAskQueue.begin(); - const LLUUID& agent_id = *it; + LLUUID agent_id = *it; sAskQueue.erase(it); if (url.empty()) @@ -416,7 +416,7 @@ void LLAvatarNameCache::requestNamesViaLegacy() for (S32 requests = 0; !sAskQueue.empty() && requests < MAX_REQUESTS; ++requests) { it = sAskQueue.begin(); - const LLUUID& agent_id = *it; + LLUUID agent_id = *it; sAskQueue.erase(it); // Mark as pending first, just in case the callback is immediately @@ -563,8 +563,7 @@ void LLAvatarNameCache::eraseUnrefreshed() const LLAvatarName& av_name = it->second; if (av_name.mExpires < max_unrefreshed) { - const LLUUID& agent_id = it->first; - LL_DEBUGS("AvNameCache") << agent_id + LL_DEBUGS("AvNameCache") << it->first << " user '" << av_name.mUsername << "' " << "expired " << now - av_name.mExpires << " secs ago" << LL_ENDL; |