summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-02-17 20:49:44 -0800
committerJames Cook <james@lindenlab.com>2010-02-17 20:49:44 -0800
commit9cb30255b6b8827410a32c6bee1c22b8011de60e (patch)
tree199dc92ee82f2433b52834de42ef88ed9cd3790a
parent55bfb4435e1a2ffc34578bf30877eb24a5edaa29 (diff)
Fix Mac/Linux build
Dang finicky LLSD map dereferences
-rw-r--r--indra/llmessage/llavatarnamecache.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index a7ed20ac9b..0d6981a9d9 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -86,8 +86,8 @@ void LLAvatarNameResponder::result(const LLSD& content)
const LLSD& row = *it;
LLAvatarName av_name;
- av_name.mSLID = row["slid"];
- av_name.mDisplayName = row["display_name"];
+ av_name.mSLID = row["slid"].asString();
+ av_name.mDisplayName = row["display_name"].asString();
av_name.mLastUpdate = now;
// HACK for pretty stars
@@ -100,13 +100,13 @@ void LLAvatarNameResponder::result(const LLSD& content)
if (av_name.mDisplayName.empty())
{
// make up a display name
- std::string first_name = row["first_name"];
- std::string last_name = row["last_name"];
+ std::string first_name = row["first_name"].asString();
+ std::string last_name = row["last_name"].asString();
av_name.mDisplayName =
LLCacheName::buildFullName(first_name, last_name);
}
- LLUUID agent_id = row["agent_id"];
+ LLUUID agent_id = row["agent_id"].asUUID();
LLAvatarNameCache::sCache[agent_id] = av_name;
LLAvatarNameCache::sPendingQueue.erase(agent_id);