From 49b7173b87d7ce3de6fa8dd128ae1982edaf9209 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 15 Jun 2010 21:25:47 -0700
Subject: Moved admin options in Advanced into new Admin Options submenu

Makes the Advanced menu fit in windowed mode at 1024x768.
---
 .../skins/default/xui/en-us/menu_viewer.xml        | 47 +++++++++++++---------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 0293250..8cc2518 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -2065,6 +2065,33 @@
                   userdata="stop record" />
       </menu_item_call>
     </menu>
+    
+    
+    <!-- ADMIN OPTIONS -->
+
+    <menu name="Admin Options" drop_shadow="true"
+          opaque="true" tear_off="true">
+      <menu_item_check name="View Admin Options"
+                   label="View Admin Options"
+                   shortcut="control|alt|V">
+        <on_click function="Advanced.ToggleViewAdminOptions"
+                  userdata="" />
+        <on_check function="Advanced.CheckViewAdminOptions"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_call name="Request Admin Status"
+                      label="Request Admin Status"
+                      shortcut="control|alt|G">
+        <on_click function="Advanced.RequestAdminStatus"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Leave Admin Status"
+                      label="Leave Admin Status"
+                      shortcut="control|alt|shift|G">
+        <on_click function="Advanced.LeaveAdminStatus"
+                  userdata="" />
+      </menu_item_call>
+    </menu>
 
 
     <menu_item_separator />
@@ -2134,26 +2161,6 @@
       <on_click function="Advanced.ShowDebugSettings"
                 userdata="" />
     </menu_item_call>
-    <menu_item_check name="View Admin Options"
-                     label="View Admin Options"
-                     shortcut="control|alt|V">
-      <on_click function="Advanced.ToggleViewAdminOptions"
-                userdata="" />
-      <on_check function="Advanced.CheckViewAdminOptions"
-                userdata="" />
-    </menu_item_check>
-    <menu_item_call name="Request Admin Status"
-                    label="Request Admin Status"
-                    shortcut="control|alt|G">
-      <on_click function="Advanced.RequestAdminStatus"
-                userdata="" />
-    </menu_item_call>
-    <menu_item_call name="Leave Admin Status"
-                    label="Leave Admin Status"
-                    shortcut="control|alt|shift|G">
-      <on_click function="Advanced.LeaveAdminStatus"
-                userdata="" />
-    </menu_item_call>
 
   </menu>
 
-- 
cgit v1.1