summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2013-02-04 01:01:07 +0100
committerKitty Barnett <develop@catznip.com>2013-02-04 01:01:07 +0100
commitd149aea87c3214ea9510ea43a7e23e03cdcb27e6 (patch)
treefbda1184d646a86b63d5496fe64e9a7659788f1d /indra/llmessage
parent0a99aadd7a9d5d5166ef4e581b935adc6fb034ea (diff)
parent132db13fb6bb6dd802d3ee000a10e91127403547 (diff)
Merged with viewer-dev-materials
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llavatarnamecache.cpp7
1 files changed, 3 insertions, 4 deletions
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;