From 9cb30255b6b8827410a32c6bee1c22b8011de60e Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 17 Feb 2010 20:49:44 -0800
Subject: [PATCH] Fix Mac/Linux build Dang finicky LLSD map dereferences
---
indra/llmessage/llavatarnamecache.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index a7ed20ac9b6..0d6981a9d99 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);
--
GitLab