STORM-1174 FIX Moved "Use Region Environment Settings" to the "World -> Edit My Environment" menu.

It has been a checkbox in the environment editor.

1 files changed, 1 insertions, 24 deletions

diff --git a/indra/newview/llfloaterenvsettings.cpp b/indra/newview/llfloaterenvsettings.cpp
index 2fa022049d..a2a6005b14 100644
--- a/indra/newview/llfloaterenvsettings.cpp
+++ b/indra/newview/llfloaterenvsettings.cpp
@@ -71,31 +71,9 @@ BOOL LLFloaterEnvSettings::postBuild()
 	initCallbacks();
 	syncMenu();
 
-	LLEnvKey::EScope cur_scope = LLEnvManager::getInstance()->getNormallyDisplayedScope();
-	childSetValue("RegionWLOptIn", cur_scope == LLEnvKey::SCOPE_REGION);
-
 	return TRUE;
 }
 
-void LLFloaterEnvSettings::onUseRegionEnvironment(LLUICtrl* ctrl, void* data)
-{
-	//LLFloaterEnvSettings* self = (LLFloaterEnvSettings*)data;
-	LLCheckBoxCtrl* checkbox = static_cast<LLCheckBoxCtrl*>(ctrl); //self->getChildView("RegionWLOptIn");
-	setOptIn(checkbox->getValue().asBoolean());
-}
-
-void LLFloaterEnvSettings::setOptIn(bool opt_in)
-{
-	if (opt_in)
-	{
-		LLEnvManager::getInstance()->setNormallyDisplayedScope(LLEnvKey::SCOPE_REGION);
-	}
-	else
-	{
-		LLEnvManager::getInstance()->setNormallyDisplayedScope(LLEnvKey::SCOPE_LOCAL);
-	}
-}
-
 void LLFloaterEnvSettings::initCallbacks(void) 
 {
 	// our three sliders
@@ -112,8 +90,7 @@ void LLFloaterEnvSettings::initCallbacks(void)
 	childSetCommitCallback("EnvUseEstateTimeButton", &LLFloaterEnvSettings::onUseEstateTime, NULL);
 	getChild<LLUICtrl>("EnvUseLocalTimeButton")->setCommitCallback(boost::bind(&LLFloaterEnvSettings::onUseLocalTime));
 
-	childSetCommitCallback("RegionWLOptIn", &LLFloaterEnvSettings::onUseRegionEnvironment, NULL);
-	getChild<LLUICtrl>("RegionWLOptIn")->setRightMouseDownCallback(boost::bind(&LLEnvManager::dumpScopes, &LLEnvManager::instance()));
+	getChild<LLUICtrl>("EnvUseEstateTimeButton")->setRightMouseDownCallback(boost::bind(&LLEnvManager::dumpScopes, &LLEnvManager::instance()));
 }