From db6862e15b1ff6257593eab798250316a350cf73 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 19 Apr 2011 23:24:28 +0300
Subject: STORM-1174 FIX Moved "Use Region Environment Settings" to the "World
 -> Edit My Environment" menu.

It has been a checkbox in the environment editor.
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 51610c0ae0..150e067ab2 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -470,7 +470,7 @@
 
         <menu_item_separator/>
 
-    <menu
+        <menu
          create_jump_keys="true"
          label="Sun"
          name="Environment Settings"
@@ -523,6 +523,22 @@
                  parameter="editor" />
             </menu_item_call>
         </menu>
+	    <menu
+	     create_jump_keys="true"
+	     label="Edit My Environment"
+	     name="Environment"
+	     tear_off="true">
+            <menu_item_check
+             label="Use Region Settings"
+             name="Use Region Settings">
+                <on_check
+                 function="World.CheckEnvironment"
+                 parameter="use_region_settings" />
+                <on_click
+                 function="World.Environment"
+                 parameter="use_region_settings" />
+            </menu_item_check>
+	    </menu>
     </menu>
     <menu
      create_jump_keys="true"
-- 
cgit v1.2.3