STORM-1262 FIXED Removed the original Windlight Region Settings implementation.

1 files changed, 0 insertions, 20 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index e8c91cd0f0..55eea8fc69 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7583,16 +7583,7 @@ class LLWorldEnvSettings : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		std::string tod = userdata.asString();
-		LLVector3 sun_direction;
 		
-		if (tod == "old_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("old_env_settings");
-			return true;
-		}
-
 		if (tod == "editor")
 		{
 			LLFloaterReg::toggleInstance("env_settings");
@@ -7685,16 +7676,6 @@ class LLWorldPostProcess : public view_listener_t
 	}
 };
 
-/// Day Cycle callbacks
-class LLWorldDayCycle : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		LLFloaterReg::showInstance("env_day_cycle");
-		return true;
-	}
-};
-
 class LLWorldToggleMovementControls : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
@@ -7925,7 +7906,6 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLWorldEnvSettings(), "World.EnvSettings");
 	view_listener_t::addMenu(new LLWorldEnvPreset(), "World.EnvPreset");
 	view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
-	view_listener_t::addMenu(new LLWorldDayCycle(), "World.DayCycle");
 
 	view_listener_t::addMenu(new LLWorldToggleMovementControls(), "World.Toggle.MovementControls");
 	view_listener_t::addMenu(new LLWorldToggleCameraControls(), "World.Toggle.CameraControls");