summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorChris Baker <baker@lindenlab.com>2012-09-04 10:54:16 -0700
committerChris Baker <baker@lindenlab.com>2012-09-04 10:54:16 -0700
commit5dfbc62c1bbab145b1f1b826833c0e485fc73250 (patch)
treedf79f355e173bfb50c9bc3f5cd4e3a338ca52fbd /indra
parent7ecf3ce40f4ec27a43878a3a2192c97479d22fcf (diff)
Cleaned up comments
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llgroupmgr.cpp25
1 files changed, 8 insertions, 17 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index b9bcedda13..7a738bd9ea 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1836,9 +1836,7 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
}
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-// I DON'T KNOW WHERE TO PUT THIS
+// Responder class for capability group management
class GroupMemberDataResponder : public LLHTTPClient::Responder
{
public:
@@ -1854,8 +1852,6 @@ void GroupMemberDataResponder::result(const LLSD& content)
{
LLGroupMgr::processCapGroupMembersRequest(content);
}
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
// static
@@ -1870,8 +1866,8 @@ void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id)
// Check to make sure we have our capabilities
if(!currentRegion->capabilitiesReceived())
{
- LL_INFOS("BAKER") << " Capabilities not received! -- OSHITSON --" << LL_ENDL;
- // BAKER TODO: Handle this!
+ LL_INFOS("BAKER") << " Capabilities not received!" << LL_ENDL;
+ return;
}
// Get our capability
@@ -1880,10 +1876,10 @@ void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id)
// Post to our service. Add a body containing the group_id.
LLSD body = LLSD::emptyMap();
body["group_id"] = group_id;
- // Session id?
LLHTTPClient::ResponderPtr grp_data_responder = new GroupMemberDataResponder();
- // This could take a while to finish, timeout after 10 minutes.
+
+ // This could take a while to finish, timeout after 10 minutes.
LLHTTPClient::post(cap_url, body, grp_data_responder, LLSD(), 600);
mLastGroupMembersRequestFrame = gFrameCount;
@@ -1896,8 +1892,8 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
// Did we get anything in content?
if(!content.size())
{
- // BAKER TODO:
- // Maybe display a popup saying something went wrong?
+ LL_DEBUGS("GrpMgr") << "No group member data received." << LL_ENDL;
+ return;
}
// If we have no members, there's no reason to do anything else
@@ -1943,8 +1939,7 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
const LLUUID member_id(member_iter_start->first);
LLSD member_info = member_iter_start->second;
-
- // Online Status
+
if(member_info.has("last_login"))
{
online_status = member_info["last_login"];
@@ -1954,19 +1949,15 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
formatDateString(online_status);
}
- // Title
if(member_info.has("title"))
title = titles[member_info["title"].asInteger()];
- // Powers
if(member_info.has("powers"))
member_powers = llstrtou64(member_info["powers"].asString().c_str(), NULL, 16);
- // Land Contribution
if(member_info.has("donated_square_meters"))
contribution = member_info["donated_square_meters"];
- // Owner Flag
if(member_info.has("owner"))
is_owner = true;