From 5520bebaeb486462a3482173ccc8518d9158e0d5 Mon Sep 17 00:00:00 2001
From: Baker Linden <baker@lindenlab.com>
Date: Thu, 6 Sep 2012 16:00:59 -0700
Subject: Do the proper fix this time...
---
indra/newview/llgroupmgr.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 9841eda625..9c0a30e689 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1937,7 +1937,7 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
{
// Reset defaults
online_status = "unknown";
- title = (std::string)titles[0];
+ title = titles[0].asString();
contribution = 0;
member_powers = default_powers;
is_owner = false;
@@ -1947,7 +1947,7 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
if(member_info.has("last_login"))
{
- online_status = (std::string)member_info["last_login"];
+ online_status = member_info["last_login"].asString();
if(online_status == "Online")
online_status = LLTrans::getString("group_member_status_online");
else
@@ -1955,7 +1955,7 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
}
if(member_info.has("title"))
- title = (std::string)titles[member_info["title"].asInteger()];
+ title = titles[member_info["title"].asInteger()].asString();
if(member_info.has("powers"))
member_powers = llstrtou64(member_info["powers"].asString().c_str(), NULL, 16);
--
cgit v1.2.3