From 3875eba69bf41ebcec16168a813c7a6d4a779262 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 1 Nov 2010 19:57:36 -0700
Subject: Don't show the open region settings panel in the Estate window when
 the OpenRegionSettings capability isn't found (i.e. we're not on Aurora)

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

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index c7f1c38..aca8db7 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -182,10 +182,15 @@ BOOL LLFloaterRegionInfo::postBuild()
 	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_general.xml");
 	mTab->addTabPanel(panel, panel->getLabel(), TRUE);
 
-	panel = new LLPanelRegionOpenSettingsInfo;
-	mInfoPanels.push_back(panel);
-	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_open_region_settings.xml");
-	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+	// We only use this panel on Aurora-based sims -- MC
+	std::string url = gAgent.getRegion()->getCapability("OpenRegionSettings");
+	if (!url.empty())
+	{
+		panel = new LLPanelRegionOpenSettingsInfo;
+		mInfoPanels.push_back(panel);
+		LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_open_region_settings.xml");
+		mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+	}
 
 	panel = new LLPanelRegionDebugInfo;
 	mInfoPanels.push_back(panel);
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index b63914c..cf2e3a4 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1436,6 +1436,8 @@ 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