[MAINT-513] Large group management

- Reduced the timeout to 5 minutes, down from 10 minutes.
- Provided output for GroupMemberResponder error
- Removed commented calls to sendGroupMembersRequest
- Reordered calls to sendCapGroupMembersRequest so it's called last

4 files changed, 13 insertions, 13 deletions

diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 7a738bd9ea..3fed8bb9b0 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1843,11 +1843,16 @@ public:
 		GroupMemberDataResponder() {}
 		virtual ~GroupMemberDataResponder() {}
 		virtual void result(const LLSD& pContent);
-		virtual void error(U32 pStatus, const std::string& pReason) {}
+		virtual void error(U32 pStatus, const std::string& pReason);
 private:
 		LLSD mMemberData;
 };
 
+void GroupMemberDataResponder::error(U32 pStatus, const std::string& pReason)
+{
+	LL_WARNS("GrpMgr") << "Error receiving group member data." << LL_ENDL;
+}
+
 void GroupMemberDataResponder::result(const LLSD& content)
 {
 	LLGroupMgr::processCapGroupMembersRequest(content);
@@ -1866,7 +1871,7 @@ void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id)
 	// Check to make sure we have our capabilities
 	if(!currentRegion->capabilitiesReceived())
 	{
-		LL_INFOS("BAKER") << " Capabilities not received!" << LL_ENDL;
+		LL_WARNS("GrpMgr") << " Capabilities not received!" << LL_ENDL;
 		return;
 	}
 
@@ -1879,8 +1884,8 @@ void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id)
 
 	LLHTTPClient::ResponderPtr grp_data_responder = new GroupMemberDataResponder();
 	
-	// This could take a while to finish, timeout after 10 minutes.
-	LLHTTPClient::post(cap_url, body, grp_data_responder, LLSD(), 600);
+	// This could take a while to finish, timeout after 5 minutes.
+	LLHTTPClient::post(cap_url, body, grp_data_responder, LLSD(), 300);
 
 	mLastGroupMembersRequestFrame = gFrameCount;
 }
@@ -1975,6 +1980,9 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
 	// this entire system (it would be nice, but I don't have the time), 
 	// I'm going to be dumb and just call services I most likely don't need 
 	// with the thought being that the system might need it to be done.
+	// 
+	// TODO:
+	// Refactor to reduce multiple calls for data we already have.
 	if(group_datap->mTitles.size() < 1)
 		LLGroupMgr::getInstance()->sendGroupTitlesRequest(group_id);
 
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 5b1c15ca45..f6ce7de47e 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -313,12 +313,10 @@ void LLPanelGroupGeneral::activate()
 	{
 		LLGroupMgr::getInstance()->sendGroupTitlesRequest(mGroupID);
 		LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mGroupID);
-
 		
 		if (!gdatap || !gdatap->isMemberDataComplete() )
 		{
 			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
-			//LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
 		}
 
 		mFirstUse = FALSE;
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index f1ba84ec36..1ed8d8cf03 100644
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -570,11 +570,8 @@ void LLPanelGroupInvite::updateLists()
 		if (!mPendingUpdate) 
 		{
 			LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mImplementation->mGroupID);
-			
-			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mImplementation->mGroupID);
-			//LLGroupMgr::getInstance()->sendGroupMembersRequest(mImplementation->mGroupID);
-
 			LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mImplementation->mGroupID);
+			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mImplementation->mGroupID);
 		}
 		mPendingUpdate = TRUE;
 	} 
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 0e40224346..bbe47ae943 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -357,7 +357,6 @@ void LLPanelGroupRoles::activate()
 		if (!gdatap || !gdatap->isMemberDataComplete() )
 		{
 			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
-			//LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
 		}
 
 		// Check role data.
@@ -1989,7 +1988,6 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
 	if (!gdatap || !gdatap->isMemberDataComplete())
 	{
 		LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
-		//LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
 	}
 	
 	if (!gdatap || !gdatap->isRoleMemberDataComplete())
@@ -2583,7 +2581,6 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
 	else
 	{
 		LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
-		//LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
 	}
 
 	if (gdatap->isRoleDataComplete())