diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-09 16:55:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-09 16:55:34 -0500 |
| commit | 896a2d3651cf2b117ea5e099f9ae71a3b70bfd34 (patch) | |
| tree | 181f0f9e1874c853acb0a32c60f140ef524d9ee4 | |
| parent | 8b78b9960a32fb7a8a8663478d3fd30de65095fd (diff) | |
| parent | fde976cf2bf9740dcd821ad37f0747beaabe34dd (diff) | |
merge up to 3.4.4-beta4
| -rwxr-xr-x | .hgtags | 2 | ||||
| -rw-r--r-- | indra/llmessage/llavatarnamecache.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -391,3 +391,5 @@ cd39255bd23330fd30c04105f2811e941d8524fe 3.4.4-beta2 2c4011bbc2b15b82198fd8b51f3a9fe765a08c4d DRTVWR-271 2f8a3ef687bc55828abcb17ac1ad7cde70536d7e 3.4.4-beta3 35cfd4cf5b895fa776592f2e630e330be7f0604e DRTVWR-273 +c374035d459af3c03dea2dd90880dfc25de64706 DRTVWR-275 +05d9f1dd7a954069af2a33abedb7713fa36a04cb 3.4.4-beta4 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; |