From e979139e2b1f0dc5c8e2e89cc8c7805dfbccdba0 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 27 Jun 2014 14:03:22 +0200
Subject: [PATCH] FIRE-14011: Fix Firestorm-specific windlight menu item issues
 introduced in viewer-interesting merge

---
 indra/newview/llviewermenu.cpp                   |  6 ------
 .../newview/skins/default/xui/en/menu_viewer.xml | 16 ++++++++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ba5c912e8e..98f2e33932 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -10025,12 +10025,6 @@ class LLWorldEnvSettings : public view_listener_t
 		{
 			LLEnvManagerNew::instance().setUseSkyPreset("Midnight");
 		}
-// [RLVa:KB] - Checked: 2011-09-03 (RLVa-1.4.1a) | Added: RLVa-1.4.1a
-		else if ("default" == tod)
-		{
-			LLEnvManagerNew::instance().setUseRegionSettings(true);
-		}
-// [/RLVa:KB]
 		else
 		{
 			LLEnvManagerNew &envmgr = LLEnvManagerNew::instance();
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6f041cecb4..58791d488e 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -957,13 +957,13 @@
              label="Sunrise"
              name="Sunrise"
 			 shortcut="control|shift|U">
-                <menu_item_call.on_click
+                <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="sunrise" />
                 <menu_item_check.on_check
                  function="World.EnableEnvSettings" 
                  parameter="sunrise" />
-                <menu_item_call.on_enable
+                <menu_item_check.on_enable
                  function="RLV.EnableIfNot"
                  parameter="setenv" />
             </menu_item_check>
@@ -977,7 +977,7 @@
                 <menu_item_check.on_check
                  function="World.EnableEnvSettings" 
                  parameter="noon" />
-                <menu_item_call.on_enable
+                <menu_item_check.on_enable
                  function="RLV.EnableIfNot"
                  parameter="setenv" />
             </menu_item_check>
@@ -991,7 +991,7 @@
                 <menu_item_check.on_check
                  function="World.EnableEnvSettings" 
                  parameter="sunset" />
-                <menu_item_call.on_enable
+                <menu_item_check.on_enable
                  function="RLV.EnableIfNot"
                  parameter="setenv" />
             </menu_item_check>
@@ -999,13 +999,13 @@
              label="Midnight"
              name="Midnight"
 			 shortcut="control|shift|X">
-                <menu_item_call.on_click
+                <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="midnight" />
                 <menu_item_check.on_check
                  function="World.EnableEnvSettings" 
                  parameter="midnight" />
-                <menu_item_call.on_enable
+                <menu_item_check.on_enable
                  function="RLV.EnableIfNot"
                  parameter="setenv" />
             </menu_item_check>
@@ -1015,11 +1015,11 @@
              name="Revert to Region Default">
                 <menu_item_check.on_click
                  function="World.EnvSettings"
-                 parameter="default" />
+                 parameter="region" />
                 <menu_item_check.on_check
                  function="World.EnableEnvSettings" 
                  parameter="region" />
-                <menu_item_call.on_enable
+                <menu_item_check.on_enable
                  function="RLV.EnableIfNot"
                  parameter="setenv" />
             </menu_item_check>