1 files changed, 22 insertions, 31 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 808ab1e344..a53f56ce33 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7625,70 +7625,62 @@ class LLWorldEnvSettings : public view_listener_t
 		if (tod == "editor")
 		{
 			// if not there or is hidden, show it
+			// *TODO replace with LLFloaterWindLight::show(LLEnvKey::SCOPE_LOCAL) to make sure we're using the right scope?
 			LLFloaterReg::toggleInstance("env_settings");
 			return true;
 		}
-		else if(gSavedSettings.getBOOL("UseEnvironmentFromRegion"))
+
+		if (gSavedSettings.getBOOL("UseEnvironmentFromRegion"))
 		{
 			LLNotifications::instance().add("EnvLockedUsingRegion", LLSD(), LLSD());
+			return true;
 		}
-		else
-		{
+
 		if (tod == "sunrise")
 		{
 			// set the value, turn off animation
-				LLWLParamManager::getInstance()->mAnimator.setDayTime(0.25);
-				LLWLParamManager::getInstance()->mAnimator.deactivate();
+			LLWLParamManager::getInstance()->mAnimator.setDayTime(0.25);
+			LLWLParamManager::getInstance()->mAnimator.deactivate();
 
 			// then call update once
-				LLWLParamManager::getInstance()->mAnimator.update(
-					LLWLParamManager::getInstance()->mCurParams);
+			LLWLParamManager::getInstance()->mAnimator.update(
+				LLWLParamManager::getInstance()->mCurParams);
 		}
 		else if (tod == "noon")
 		{
 			// set the value, turn off animation
-				LLWLParamManager::getInstance()->mAnimator.setDayTime(0.567);
-				LLWLParamManager::getInstance()->mAnimator.deactivate();
+			LLWLParamManager::getInstance()->mAnimator.setDayTime(0.567);
+			LLWLParamManager::getInstance()->mAnimator.deactivate();
 
 			// then call update once
-				LLWLParamManager::getInstance()->mAnimator.update(
-					LLWLParamManager::getInstance()->mCurParams);
+			LLWLParamManager::getInstance()->mAnimator.update(
+				LLWLParamManager::getInstance()->mCurParams);
 		}
 		else if (tod == "sunset")
 		{
 			// set the value, turn off animation
-				LLWLParamManager::getInstance()->mAnimator.setDayTime(0.75);
-				LLWLParamManager::getInstance()->mAnimator.deactivate();
+			LLWLParamManager::getInstance()->mAnimator.setDayTime(0.75);
+			LLWLParamManager::getInstance()->mAnimator.deactivate();
 
 			// then call update once
-				LLWLParamManager::getInstance()->mAnimator.update(
-					LLWLParamManager::getInstance()->mCurParams);
+			LLWLParamManager::getInstance()->mAnimator.update(
+				LLWLParamManager::getInstance()->mCurParams);
 		}
 		else if (tod == "midnight")
 		{
 			// set the value, turn off animation
-				LLWLParamManager::getInstance()->mAnimator.setDayTime(0.0);
-				LLWLParamManager::getInstance()->mAnimator.deactivate();
+			LLWLParamManager::getInstance()->mAnimator.setDayTime(0.0);
+			LLWLParamManager::getInstance()->mAnimator.deactivate();
 
 			// then call update once
-				LLWLParamManager::getInstance()->mAnimator.update(
-					LLWLParamManager::getInstance()->mCurParams);
+			LLWLParamManager::getInstance()->mAnimator.update(
+				LLWLParamManager::getInstance()->mCurParams);
 		}
 		else
 		{
-				LLWLParamManager::getInstance()->mAnimator.activate(LLWLAnimator::TIME_LINDEN);
-			}
+			LLWLParamManager::getInstance()->mAnimator.activate(LLWLAnimator::TIME_LINDEN);
 		}
-		return true;
-	}
-};
 
-/// Water Menu callbacks
-class LLWorldWaterSettings : public view_listener_t
-{	
-	bool handleEvent(const LLSD& userdata)
-	{
-		LLFloaterReg::toggleInstance("env_water");
 		return true;
 	}
 };
@@ -7926,7 +7918,6 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLWorldCheckAlwaysRun(), "World.CheckAlwaysRun");
 	
 	view_listener_t::addMenu(new LLWorldEnvSettings(), "World.EnvSettings");
-	view_listener_t::addMenu(new LLWorldWaterSettings(), "World.WaterSettings");
 	view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
 	view_listener_t::addMenu(new LLWorldDayCycle(), "World.DayCycle");