From d0cda13235079c6626ebc7bbe4de542784d50fa0 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 11 Oct 2011 22:49:00 -0700
Subject: EXP-1275 FIX A UI element or Keyboard shortcut to clear the viewport
 Ctrl+Shift+U now toggles UI and hides floaters refactored main_view.xml made
 all members of llviewerwindow private

---
 indra/newview/skins/default/xui/en/main_view.xml   | 173 +++++++--------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |   7 +
 2 files changed, 66 insertions(+), 114 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 96d070ae50..2c07e8e35f 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -8,98 +8,71 @@
  tab_stop="false" 
  name="main_view"
  width="1024">
+  <view top="0"
+      follows="all"
+      height="768"
+      left="0"
+      mouse_opaque="false"
+      name="world_view_rect"
+      width="1024"/>
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
-                height="749"
+                height="768"
                 name="menu_stack"
                 orientation="vertical"
-                top="19">
+                top="0">
+    <layout_panel mouse_opaque="false"
+              follows="left|right|top"
+              name="status_bar_container"
+              tab_stop="false"
+              height="19"
+              left="0"
+              top="0"
+              width="1024"
+              user_resize="false"
+              auto_resize="false"
+              visible="true">
+      <view mouse_opaque="false"
+            follows="all"
+            name="menu_bar_holder"
+            left="0"
+            top="0"
+            width="1024"
+            height="19"/>
+    </layout_panel>
     <layout_panel auto_resize="false"
                   height="34"
                   mouse_opaque="false"
                   name="nav_bar_container"
                   tab_stop="false"
                   width="1024"
-                  user_resize="false" 
-                  visible="false">
-    </layout_panel>
-    <layout_panel auto_resize="true"
+                  user_resize="false"
+                  visible="false"/>
+    <layout_panel auto_resize="true"  
                   follows="all"
                   height="500"
                   layout="topleft"
                   mouse_opaque="false"
                   tab_stop="false" 
-                  name="hud"
+                  name="world_panel"
                   width="1024">
-      <layout_stack border_size="0"
-                    follows="all"
-                    height="500"
-                    left="0"
-                    mouse_opaque="false"
-                    name="hud_stack"
-                    orientation="horizontal"
-                    top="0"
-                    width="1024">
-        <layout_panel auto_resize="true"
-               follows="all"
-               height="500"
-               layout="topleft"
-               mouse_opaque="false"
-               tab_stop="false"
-               name="non_side_tray_view"
-               user_resize="false"
-               width="500">
-          <view bottom="500"
-                follows="all"
-                height="500"
-                left="0"
-                mouse_opaque="false"
-                name="world_view_rect"
-                width="500"/>
-          <layout_stack border_size="0"
-                        bottom="500"
-                        follows="all"
-                        height="500"
-                        left="0"
-                        mouse_opaque="false"
-                        name="world_stack"
-                        orientation="vertical">
-            <layout_panel auto_resize="true"
-                          follows="all"
-                          height="500"
-                          layout="topleft"
-                          tab_stop="false"
-                          mouse_opaque="false"
-                          user_resize="false" 
-                          name="hud container"
-                          width="500">
-              <panel follows="left|top"
-                     height="19"
-                     left="0"
-                     mouse_opaque="false"
-                     name="topinfo_bar_container"
-                     tab_stop="false"
-                     top="0"
-                     visible="false"
-                     width="1024"/>
-            </layout_panel>
-            <!--<layout_panel auto_resize="false"
-                   min_height="33"
-                   height="33" 
-                   mouse_opaque="false"
-                   name="bottom_tray_container"
-                   visible="false"/>-->
-          </layout_stack>
-        </layout_panel>
-      </layout_stack>
+      <panel follows="left|top|right"
+             height="19"
+             left="0"
+             mouse_opaque="false"
+             name="topinfo_bar_container"
+             tab_stop="false"
+             top="0"
+             visible="false"
+             width="1024"/>
       <panel top="0"
-         follows="all"
-         height="500"
-         mouse_opaque="false"
-         name="login_panel_holder"
-         width="1024"/>
-
+             left="0"
+             follows="all"
+             height="500"
+             mouse_opaque="false"
+             name="login_panel_holder"
+             width="1024"/>
       <debug_view follows="all"
                   left="0"
                   top="0"
@@ -107,55 +80,27 @@
                   height="500"
                   name="DebugView"
                   width="1024"/>
-
-      <panel follows="all"
+      <floater_view follows="all"
                     height="500"
                     left="0"
                     mouse_opaque="false"
-                    name="floater_view_holder"
+                    name="Floater View"
                     tab_group="-1"
                     tab_stop="false"
                     top="0"
-                    width="1024">
-        <floater_view follows="all"
-                      height="500"
-                      left="0"
-                      mouse_opaque="false"
-                      name="Floater View"
-                      tab_group="-1"
-                      tab_stop="false"
-                      top="0"
-                      width="1024"/>
-      </panel>
+                    width="1024"/>
       <panel name="toolbar_view_holder"
-	    follows="all"
-		layout="topleft"
-        height="500"
-        width="1024"
-        top="0"
-        left="0"
-        mouse_opaque="false"
-        tab_stop="false">
-       </panel>
+             follows="all"
+             layout="topleft"
+             height="500"
+             width="1024"
+             top="0"
+             left="0"
+             mouse_opaque="false"
+             tab_stop="false"/>
     </layout_panel>
   </layout_stack>
-  <panel mouse_opaque="false"
-         follows="left|right|top"
-         name="status_bar_container"
-         tab_stop="false"
-         height="19"
-         left="0" 
-         top="0" 
-         width="1024"
-         visible="false"/>
-  
-  <view mouse_opaque="false"
-        follows="all"
-        name="menu_bar_holder"
-        left="0"
-        top="0"
-        width="1024"
-        height="768"/>
+ 
   <panel top="0"
         follows="all"
         mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index efa61dbd11..fdbc3d1882 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1719,6 +1719,13 @@
                 <menu_item_call.on_click
                  function="View.DefaultUISize" />
             </menu_item_call>
+            <menu_item_call
+               label="Toggle UI"
+               name="Toggle UI"
+               shortcut="control|shift|U">
+                <menu_item_call.on_click
+                 function="View.ToggleUI" />
+              </menu_item_call>
             <!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility.  The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. -->
             <menu_item_check
                label="Show Advanced Menu - legacy shortcut"
-- 
cgit v1.2.3