From 0c4a202692432b32bb8f8157b8b51085bd56a21c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 1 Nov 2010 21:39:24 -0700
Subject: Use the right name for the Aurora capability

---
 linden/indra/newview/llfloaterregioninfo.cpp | 2 +-
 linden/indra/newview/llviewerregion.cpp      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 76e6b01..9e6f323 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -183,7 +183,7 @@ BOOL LLFloaterRegionInfo::postBuild()
 	mTab->addTabPanel(panel, panel->getLabel(), TRUE);
 
 	// We only use this panel on Aurora-based sims -- MC
-	std::string url = gAgent.getRegion()->getCapability("OpenRegionSettings");
+	std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");
 	if (!url.empty())
 	{
 		panel = new LLPanelRegionOpenSettingsInfo;
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index cf2e3a4..e62bd3c 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1422,6 +1422,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	LLSD capabilityNames = LLSD::emptyArray();
 	capabilityNames.append("ChatSessionRequest");
 	capabilityNames.append("CopyInventoryFromNotecard");
+	// Aurora settings -- MC
 	capabilityNames.append("DispatchOpenRegionSettings");
 	capabilityNames.append("DispatchRegionInfo");
 	capabilityNames.append("DispatchWindLightSettings");
@@ -1436,8 +1437,6 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	capabilityNames.append("MapLayer");
 	capabilityNames.append("MapLayerGod");
 	capabilityNames.append("NewFileAgentInventory");
-	// Aurora settings -- MC
-	capabilityNames.append("OpenRegionSettings");
 	capabilityNames.append("ParcelPropertiesUpdate");
 	capabilityNames.append("ParcelVoiceInfoRequest");
 	capabilityNames.append("ProductInfoRequest");
-- 
cgit v1.1