Skip to content
Snippets Groups Projects
Commit a905f7c7 authored by Chris Baker's avatar Chris Baker
Browse files

- Fixed an issue where group list wouldn't fall back to UDP if the region...

- Fixed an issue where group list wouldn't fall back to UDP if the region doesn't support the new GroupMemberData capabaility
- Fixed a potential null pointer crash.

Thanks to Ansariel from Firestorm for these!

Reviewer: Myself
parent 5520beba
No related branches found
No related tags found
No related merge requests found
...@@ -1867,6 +1867,12 @@ void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id) ...@@ -1867,6 +1867,12 @@ void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id)
return; return;
LLViewerRegion* currentRegion = gAgent.getRegion(); LLViewerRegion* currentRegion = gAgent.getRegion();
// Thank you FS:Ansariel!
if(!currentRegion)
{
LL_WARNS("GrpMgr") << "Agent does not have a current region. Uh-oh!" << LL_ENDL;
return;
}
// Check to make sure we have our capabilities // Check to make sure we have our capabilities
if(!currentRegion->capabilitiesReceived()) if(!currentRegion->capabilitiesReceived())
...@@ -1878,6 +1884,14 @@ void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id) ...@@ -1878,6 +1884,14 @@ void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id)
// Get our capability // Get our capability
std::string cap_url = currentRegion->getCapability("GroupMemberData"); std::string cap_url = currentRegion->getCapability("GroupMemberData");
// Thank you FS:Ansariel!
if(cap_url.empty())
{
LL_INFOS("GrpMgr") << "Region has no GroupMemberData capability. Falling back to UDP fetch." << LL_ENDL;
sendGroupMembersRequest(group_id);
return;
}
// Post to our service. Add a body containing the group_id. // Post to our service. Add a body containing the group_id.
LLSD body = LLSD::emptyMap(); LLSD body = LLSD::emptyMap();
body["group_id"] = group_id; body["group_id"] = group_id;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment