summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-05-13 17:26:06 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-05-13 17:26:06 -0700
commit2af4875309450fa3d3e266426ada12330489a8c9 (patch)
tree384bf62c1b4e14d4abbe92359675f67a94837cbc /indra/llmessage
parentb95d1142a0a9c91388d4674951c319fff0785c0c (diff)
DEV-50013 Friends in sidebar now correctly displaying names
reviewed by James
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llavatarnamecache.cpp21
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index fdbc28656e..2fc92ff36f 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -214,6 +214,27 @@ public:
// cache it and fire signals
LLAvatarNameCache::processName(agent_id, av_name, true);
}
+
+ // Same logic as error response case
+ LLSD unresolved_agents = content["bad_ids"];
+ if (unresolved_agents.size() > 0)
+ {
+ const std::string DUMMY_NAME("\?\?\?");
+ LLAvatarName av_name;
+ av_name.mSLID = DUMMY_NAME;
+ av_name.mDisplayName = DUMMY_NAME;
+ av_name.mIsDisplayNameDefault = false;
+ av_name.mIsDummy = true;
+ av_name.mExpires = expires;
+
+ it = unresolved_agents.beginArray();
+ for ( ; it != unresolved_agents.endArray(); ++it)
+ {
+ const LLUUID& agent_id = *it;
+ // cache it and fire signals
+ LLAvatarNameCache::processName(agent_id, av_name, true);
+ }
+ }
}
/*virtual*/ void error(U32 status, const std::string& reason)