summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2012-09-06 15:19:05 -0700
committerBaker Linden <baker@lindenlab.com>2012-09-06 15:19:05 -0700
commitc30ecf2ebd6ff6b6b4def9da25aea2b4c975328d (patch)
tree6f0f2bd6db71b7232b1b090ae27d26bd6a18dff7
parente459024c8283a26a1aefce0db65e0d7dd2c7e16d (diff)
Added explicit casting for Linux build, hopefully making it work.
-rw-r--r--indra/newview/llgroupmgr.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 3fed8bb9b0..9841eda625 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 = titles[0];
+ title = (std::string)titles[0];
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 = member_info["last_login"];
+ online_status = (std::string)member_info["last_login"];
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 = titles[member_info["title"].asInteger()];
+ title = (std::string)titles[member_info["title"].asInteger()];
if(member_info.has("powers"))
member_powers = llstrtou64(member_info["powers"].asString().c_str(), NULL, 16);