diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llfloaterperms.cpp | 13 | ||||
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index 4923420a3e..b03a4e9013 100755 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -182,15 +182,18 @@ llwarns << "DBG start" << llendl; } llwarns << "DBG getRegion" << llendl; - std::string object_url = gAgent.getRegion()->getCapability("DefaultObjectPermissions"); + std::string object_url = gAgent.getRegion()->getCapability("AgentPreferences"); if(!object_url.empty()) { -llwarns << "DBG post" << llendl; LLSD report = LLSD::emptyMap(); - report["Group"] = (LLSD::Integer)LLFloaterPerms::getGroupPerms(sCategoryNames[CAT_OBJECTS]); - report["Everyone"] = (LLSD::Integer)LLFloaterPerms::getEveryonePerms(sCategoryNames[CAT_OBJECTS]); - report["NextOwner"] = (LLSD::Integer)LLFloaterPerms::getNextOwnerPerms(sCategoryNames[CAT_OBJECTS]); + report["default_object_perm_masks"]["Group"] = + (LLSD::Integer)LLFloaterPerms::getGroupPerms(sCategoryNames[CAT_OBJECTS]); + report["default_object_perm_masks"]["Everyone"] = + (LLSD::Integer)LLFloaterPerms::getEveryonePerms(sCategoryNames[CAT_OBJECTS]); + report["default_object_perm_masks"]["NextOwner"] = + (LLSD::Integer)LLFloaterPerms::getNextOwnerPerms(sCategoryNames[CAT_OBJECTS]); +llwarns << "DBG post:" << report << llendl; LLHTTPClient::post(object_url, report, new LLFloaterPermsResponder()); } } diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index dd88c5b846..4cd9f9769a 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1582,6 +1582,7 @@ void LLViewerRegion::unpackRegionHandshake() void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) { + capabilityNames.append("AgentPreferences"); capabilityNames.append("AgentState"); capabilityNames.append("AttachmentResources"); capabilityNames.append("AvatarPickerSearch"); @@ -1589,7 +1590,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("ChatSessionRequest"); capabilityNames.append("CopyInventoryFromNotecard"); capabilityNames.append("CreateInventoryCategory"); - capabilityNames.append("DefaultObjectPermissions"); capabilityNames.append("DispatchRegionInfo"); capabilityNames.append("EnvironmentSettings"); capabilityNames.append("EstateChangeInfo"); |