From de358f9d7d8ba156fde0a5ed33a8bb797569e61c Mon Sep 17 00:00:00 2001
From: Jessica <none@none>
Date: Wed, 8 Jun 2011 19:17:21 -0400
Subject: [PATCH] Fix for Fire-1092, w/sidetabs skins now have same bottom bar
 buttons/menu as the skins without side tabs.

---
 .../xui/en/menu_bottomtray.xml                | 152 -----
 .../xui/en/panel_bottomtray.xml               | 164 ++---
 .../xui/en/menu_bottomtray.xml                | 152 -----
 .../xui/en/panel_bottomtray.xml               | 602 ------------------
 4 files changed, 88 insertions(+), 982 deletions(-)
 delete mode 100644 indra/newview/skins/firestormsidetabs/xui/en/menu_bottomtray.xml
 delete mode 100644 indra/newview/skins/metaharpersidetabs/xui/en/menu_bottomtray.xml
 delete mode 100644 indra/newview/skins/metaharpersidetabs/xui/en/panel_bottomtray.xml

diff --git a/indra/newview/skins/firestormsidetabs/xui/en/menu_bottomtray.xml b/indra/newview/skins/firestormsidetabs/xui/en/menu_bottomtray.xml
deleted file mode 100644
index 5beafef4e4..0000000000
--- a/indra/newview/skins/firestormsidetabs/xui/en/menu_bottomtray.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu
- height="201"
- layout="topleft"
- left="100"
- mouse_opaque="false"
- name="hide_camera_move_controls_menu"
- top="624"
- visible="false"
- width="128">
-    <menu_item_check
-         label="Gesture button"
-         layout="topleft"
-         name="ShowGestureButton">
-           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ShowGestureButton" /> 
-             <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ShowGestureButton" />
-    </menu_item_check>
-    <menu_item_check
-         label="Move button"
-         layout="topleft"
-         name="ShowMoveButton">
-           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ShowMoveButton" />
-             <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ShowMoveButton" />
-    </menu_item_check>
-    <menu_item_check
-         label="View button"
-         layout="topleft"
-         name="ShowCameraButton">
-           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ShowCameraButton" />
-             <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ShowCameraButton" />
-    </menu_item_check>        
-    <menu_item_check
-         label="Snapshot button"
-         layout="topleft"
-         name="ShowSnapshotButton">
-           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ShowSnapshotButton" />
-             <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ShowSnapshotButton" />
-    </menu_item_check>        
-    <menu_item_check
-     label="Build button"
-     layout="topleft"
-     name="ShowBuildButton">
-        <menu_item_check.on_click
-         function="ToggleControl"
-         parameter="ShowBuildButton" />
-        <menu_item_check.on_check
-         function="CheckControl"
-         parameter="ShowBuildButton" />
-    </menu_item_check>
-    <menu_item_check
-     label="Search button"
-     layout="topleft"
-     name="ShowSearchButton">
-        <menu_item_check.on_click
-         function="ToggleControl"
-         parameter="ShowSearchButton" />
-        <menu_item_check.on_check
-         function="CheckControl"
-         parameter="ShowSearchButton" />
-    </menu_item_check>
-    <menu_item_check
-     label="Map button"
-     layout="topleft"
-     name="ShowWorldMapButton">
-        <menu_item_check.on_click
-         function="ToggleControl"
-         parameter="ShowWorldMapButton" />
-        <menu_item_check.on_check
-         function="CheckControl"
-         parameter="ShowWorldMapButton" />
-    </menu_item_check>
-    <menu_item_check
-     label="Mini-Map button"
-     layout="topleft"
-     name="ShowMiniMapButton">
-        <menu_item_check.on_click
-         function="ToggleControl"
-         parameter="ShowMiniMapButton" />
-        <menu_item_check.on_check
-         function="CheckControl"
-         parameter="ShowMiniMapButton" />
-    </menu_item_check>
-    <menu_item_separator
-     name="Separator" />
-    <menu_item_call
-     label="Cut"
-     name="NearbyChatBar_Cut">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="cut" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_cut" />
-    </menu_item_call>
-    <menu_item_call
-     label="Copy"
-     name="NearbyChatBar_Copy">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="copy" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_copy" />
-    </menu_item_call>
-    <menu_item_call
-     label="Paste"
-     name="NearbyChatBar_Paste">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="paste" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_paste" />
-    </menu_item_call>
-    <menu_item_call
-     label="Delete"
-     name="NearbyChatBar_Delete">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="delete" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_delete" />
-    </menu_item_call>
-    <menu_item_call
-     label="Select All"
-     name="NearbyChatBar_Select_All">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="select_all" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_select_all" />
-    </menu_item_call>
-
-</menu>
diff --git a/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml
index a8cfe8120b..3d60d89c01 100644
--- a/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml
@@ -5,7 +5,6 @@
  bg_opaque_color="DkGray"
  chrome="true"
  follows="left|bottom|right"
- focus_root="true" 
  height="33"
  layout="topleft"
  left="0"
@@ -103,7 +102,7 @@
      height="28"
      layout="topleft"
      min_height="28"
-     min_width="59"
+     min_width="79"
      mouse_opaque="false"
      name="speak_panel"
      top_delta="0"
@@ -124,6 +123,19 @@
            parameter="voice_controls" />
         </show_button>
       </talk_button>
+      <bottomtray_button follows="left"
+          left_delta="2"
+          bottom="-3"
+          width="16"
+          height="16"
+          is_toggle="true"
+          image_selected="ptt_lock_on.tga"
+          image_unselected="ptt_lock_off.tga"
+          label=""
+          name="ptt_lock"
+          scale_image="true"
+          control_name="PushToTalkToggle">
+      </bottomtray_button>
     </layout_panel>
 
 
@@ -496,7 +508,7 @@
     </layout_panel>
 
 
-        <!--
+    <!--
          <layout_panel
          mouse_opaque="false"
          auto_resize="false"
@@ -529,84 +541,84 @@
             </button>
         </layout_panel>
         -->
-        
-        <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="40"
-         mouse_opaque="false"
-         name="bottom_sbinv"
-         user_resize="false"
-         width="40">
-            <bottomtray_button
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="false"
-             image_overlay="inventory_18"
-             layout="topleft"
-             left="0"
-             name="sidebar_inv_btn"
-             tool_tip="Shows/hides inventory"
-             top="5"
-             enabled="true"
-             use_ellipses="true"
-             width="36">
-            </bottomtray_button>
-        </layout_panel>
 
-<!-- ## Zi: AO button -->
-        <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="56"
-         mouse_opaque="false"
-         name="ao_btn_panel"
-         user_resize="false"
-         width="56">
-            <bottomtray_button
-             name="ao_toggle_btn"
-             tool_tip="Enables/Disables Animation Overrider"
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             image_overlay="ao_toggle_18"
-             layout="topleft"
-             left="0"
-             top="5"
-             use_ellipses="true"
-             width="36">
-            </bottomtray_button>
-       <bottomtray_button
-        name="ao_btn"
-        tool_tip="Shows/hides Animation Overrider"
-        left_pad="0"
-        height="23"
-        width="16"
-        image_disabled="ComboButton_UpOff"
-        image_unselected="ComboButton_UpOff"
-        image_selected="ComboButton_Up_On_Selected"
-        image_pressed="ComboButton_UpSelected"
-        image_pressed_selected="ComboButton_Up_On_Selected"
-        is_toggle="true"
-        tab_stop="true">
+    <layout_panel
+     auto_resize="false"
+     follows="left|right"
+     height="28"
+     layout="topleft"
+     min_height="28"
+     min_width="40"
+     mouse_opaque="false"
+     name="bottom_sbinv"
+     user_resize="false"
+     width="40">
+      <bottomtray_button
+       follows="left|right"
+       height="23"
+       image_pressed="PushButton_Press"
+       image_pressed_selected="PushButton_Selected_Press"
+       image_selected="PushButton_Selected_Press"
+       is_toggle="false"
+       image_overlay="inventory_18"
+       layout="topleft"
+       left="0"
+       name="sidebar_inv_btn"
+       tool_tip="Shows/hides inventory"
+       top="5"
+       enabled="true"
+       use_ellipses="true"
+       width="36">
+      </bottomtray_button>
+    </layout_panel>
+
+    <!-- ## Zi: AO button -->
+    <layout_panel
+     auto_resize="false"
+     follows="left|right"
+     height="28"
+     layout="topleft"
+     min_height="28"
+     min_width="56"
+     mouse_opaque="false"
+     name="ao_btn_panel"
+     user_resize="false"
+     width="56">
+      <bottomtray_button
+       name="ao_toggle_btn"
+       tool_tip="Enables/Disables Animation Overrider"
+       follows="left|right"
+       height="23"
+       image_pressed="PushButton_Press"
+       image_pressed_selected="PushButton_Selected_Press"
+       image_selected="PushButton_Selected_Press"
+       is_toggle="true"
+       image_overlay="ao_toggle_18"
+       layout="topleft"
+       left="0"
+       top="5"
+       use_ellipses="true"
+       width="36">
+      </bottomtray_button>
+      <bottomtray_button
+       name="ao_btn"
+       tool_tip="Shows/hides Animation Overrider"
+       left_pad="0"
+       height="23"
+       width="16"
+       image_disabled="ComboButton_UpOff"
+       image_unselected="ComboButton_UpOff"
+       image_selected="ComboButton_Up_On_Selected"
+       image_pressed="ComboButton_UpSelected"
+       image_pressed_selected="ComboButton_Up_On_Selected"
+       is_toggle="true"
+       tab_stop="true">
         <init_callback
          function="Button.SetDockableFloaterToggle"
          parameter="animation_overrider" />
       </bottomtray_button>
-        </layout_panel>
-<!-- ## Zi: AO button -->
+    </layout_panel>
+    <!-- ## Zi: AO button -->
 
     <icon
      auto_resize="false"
diff --git a/indra/newview/skins/metaharpersidetabs/xui/en/menu_bottomtray.xml b/indra/newview/skins/metaharpersidetabs/xui/en/menu_bottomtray.xml
deleted file mode 100644
index 5beafef4e4..0000000000
--- a/indra/newview/skins/metaharpersidetabs/xui/en/menu_bottomtray.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu
- height="201"
- layout="topleft"
- left="100"
- mouse_opaque="false"
- name="hide_camera_move_controls_menu"
- top="624"
- visible="false"
- width="128">
-    <menu_item_check
-         label="Gesture button"
-         layout="topleft"
-         name="ShowGestureButton">
-           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ShowGestureButton" /> 
-             <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ShowGestureButton" />
-    </menu_item_check>
-    <menu_item_check
-         label="Move button"
-         layout="topleft"
-         name="ShowMoveButton">
-           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ShowMoveButton" />
-             <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ShowMoveButton" />
-    </menu_item_check>
-    <menu_item_check
-         label="View button"
-         layout="topleft"
-         name="ShowCameraButton">
-           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ShowCameraButton" />
-             <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ShowCameraButton" />
-    </menu_item_check>        
-    <menu_item_check
-         label="Snapshot button"
-         layout="topleft"
-         name="ShowSnapshotButton">
-           <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ShowSnapshotButton" />
-             <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ShowSnapshotButton" />
-    </menu_item_check>        
-    <menu_item_check
-     label="Build button"
-     layout="topleft"
-     name="ShowBuildButton">
-        <menu_item_check.on_click
-         function="ToggleControl"
-         parameter="ShowBuildButton" />
-        <menu_item_check.on_check
-         function="CheckControl"
-         parameter="ShowBuildButton" />
-    </menu_item_check>
-    <menu_item_check
-     label="Search button"
-     layout="topleft"
-     name="ShowSearchButton">
-        <menu_item_check.on_click
-         function="ToggleControl"
-         parameter="ShowSearchButton" />
-        <menu_item_check.on_check
-         function="CheckControl"
-         parameter="ShowSearchButton" />
-    </menu_item_check>
-    <menu_item_check
-     label="Map button"
-     layout="topleft"
-     name="ShowWorldMapButton">
-        <menu_item_check.on_click
-         function="ToggleControl"
-         parameter="ShowWorldMapButton" />
-        <menu_item_check.on_check
-         function="CheckControl"
-         parameter="ShowWorldMapButton" />
-    </menu_item_check>
-    <menu_item_check
-     label="Mini-Map button"
-     layout="topleft"
-     name="ShowMiniMapButton">
-        <menu_item_check.on_click
-         function="ToggleControl"
-         parameter="ShowMiniMapButton" />
-        <menu_item_check.on_check
-         function="CheckControl"
-         parameter="ShowMiniMapButton" />
-    </menu_item_check>
-    <menu_item_separator
-     name="Separator" />
-    <menu_item_call
-     label="Cut"
-     name="NearbyChatBar_Cut">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="cut" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_cut" />
-    </menu_item_call>
-    <menu_item_call
-     label="Copy"
-     name="NearbyChatBar_Copy">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="copy" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_copy" />
-    </menu_item_call>
-    <menu_item_call
-     label="Paste"
-     name="NearbyChatBar_Paste">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="paste" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_paste" />
-    </menu_item_call>
-    <menu_item_call
-     label="Delete"
-     name="NearbyChatBar_Delete">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="delete" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_delete" />
-    </menu_item_call>
-    <menu_item_call
-     label="Select All"
-     name="NearbyChatBar_Select_All">
-        <menu_item_call.on_click
-         function="NearbyChatBar.Action"
-         parameter="select_all" />
-        <menu_item_call.on_enable
-         function="NearbyChatBar.EnableMenuItem"
-         parameter="can_select_all" />
-    </menu_item_call>
-
-</menu>
diff --git a/indra/newview/skins/metaharpersidetabs/xui/en/panel_bottomtray.xml b/indra/newview/skins/metaharpersidetabs/xui/en/panel_bottomtray.xml
deleted file mode 100644
index 0c906df326..0000000000
--- a/indra/newview/skins/metaharpersidetabs/xui/en/panel_bottomtray.xml
+++ /dev/null
@@ -1,602 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- bg_alpha_color="Transparent"
- bg_opaque_color="DkGray"
- focus_root="true"
- chrome="true"
- follows="left|bottom|right"
- height="33"
- layout="topleft"
- left="0"
- name="bottom_tray"
- top="28"
- width="1310">
-  <string
-   name="DragIndicationImageName"
-   value="Accordion_ArrowOpened_Off" />
-  <string
-   name="SpeakBtnToolTip"
-   value="Turns microphone on/off" />
-  <string
-   name="VoiceControlBtnToolTip"
-   value="Shows/hides voice control panel" />
-  <layout_stack
-   border_size="0"
-   clip="false"
-   follows="all"
-   height="28"
-   layout="topleft"
-   left="0"
-   mouse_opaque="false"
-   name="toolbar_stack"
-   orientation="horizontal"
-   top="0"
-   width="1310">
-    <layout_panel
-     auto_resize="false"
-     user_resize="false"
-     min_width="2"
-     width="2" />
-    <layout_panel
-     auto_resize="false"
-     layout="topleft"
-     max_width="320"
-     min_width="25"
-     height="28"
-     mouse_opaque="false"
- name="chat_bar_layout_panel"
-     user_resize="true"
-     width="308" >
-      <panel
-     name="chat_bar"
-        filename="panel_nearby_chat_bar.xml"
-        left="0"
-        height="28"
-        width="308"
-        top="0"
-        mouse_opaque="false"
-        follows="left|right"
-          />
-    </layout_panel>
-    <layout_panel
-     auto_resize="false"
-     follows="right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="80"
-     mouse_opaque="false"
-     name="gesture_panel"
-     top_delta="0"
-     user_resize="false"
-     width="76">
-      <gesture_combo_list
-       follows="left|right"
-       height="23"
-       label="Gestures"
-       image_overlay="gesture_18"
-       image_pressed="PushButton_Press"
-       image_pressed_selected="PushButton_Selected_Press"
-       image_selected="PushButton_Selected_Press"
-       layout="topleft"
-       left="0"
-       name="Gesture"
-       tool_tip="Shows/hides gestures"
-       top="5"
-       width="76">
-        <combo_button
-         pad_right="10"
-         use_ellipses="true" />
-        <combo_list
-         page_lines="17" />
-      </gesture_combo_list>
-    </layout_panel>
-
-
-    <!--
-        There is resize bar after the chat bar. It has 2px width (is is set as 2*UIResizeBarOverlap)
-        -->
-    <layout_panel
-     auto_resize="false"
-     follows="right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="59"
-     mouse_opaque="false"
-     name="speak_panel"
-     top_delta="0"
-     user_resize="true"
-     width="50">
-      <talk_button
-       follows="left|right"
-       height="23"
-       layout="topleft"
-       left="2"
-       name="talk"
-       top="5"
-       width="45">
-        <show_button
-         tab_stop="true">
-          <init_callback
-           function="Button.SetDockableFloaterToggle"
-           parameter="voice_controls" />
-        </show_button>
-      </talk_button>
-    </layout_panel>
-
-    <layout_panel
-     auto_resize="false"
-     follows="right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="40"
-     mouse_opaque="false"
-     name="movement_panel"
-     user_resize="false"
-     width="40">
-      <bottomtray_button
-       follows="left|right"
-       height="23"
-       image_pressed="PushButton_Press"
-       image_pressed_selected="PushButton_Selected_Press"
-       image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-       image_overlay="move_18"
-       layout="topleft"
-       name="movement_btn"
-       tool_tip="Shows/hides movement controls"
-       top="5"
-       use_ellipses="true"
-       width="36">
-        <init_callback
-         function="Button.SetDockableFloaterToggle"
-         parameter="moveview" />
-      </bottomtray_button>
-
-    </layout_panel>
-    <layout_panel
-     auto_resize="false"
-     follows="left|right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="40"
-     mouse_opaque="false"
-     name="cam_panel"
-     user_resize="false"
-     width="40">
-      <bottomtray_button
-       follows="left|right"
-       height="23"
-       image_pressed="PushButton_Press"
-       image_pressed_selected="PushButton_Selected_Press"
-       image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-       image_overlay="view_18"
-       layout="topleft"
-       left="0"
-       name="camera_btn"
-       tool_tip="Shows/hides camera controls"
-       top="5"
-       use_ellipses="true"
-       width="36">
-        <init_callback
-         function="Button.SetDockableFloaterToggle"
-         parameter="camera" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
-     auto_resize="false"
-     follows="left|right"
-     height="28"
-     layout="topleft"
-     min_width="40"
-     mouse_opaque="false"
-     name="snapshot_panel"
-     user_resize="false"
-     width="40">
-      <bottomtray_button
-       follows="left|right"
-       height="23"
-       image_overlay="Snapshot_Off"
-       image_pressed="PushButton_Press"
-       image_pressed_selected="PushButton_Selected_Press"
-       image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-       layout="topleft"
-       left="0"
-       name="snapshots"
-       tool_tip="Take snapshot"
-       top="5"
-       width="36">
-        <init_callback
-         function="Button.SetFloaterToggle"
-         parameter="snapshot" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
-     auto_resize="false"
-     follows="left|right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="40"
-     mouse_opaque="false"
-     name="build_btn_panel"
-     user_resize="false"
-     width="40">
-      <!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
-Disabled for now.
--->
-      <bottomtray_button
-       follows="left|right"
-       height="23"
-       image_pressed="PushButton_Press"
-       image_pressed_selected="PushButton_Selected_Press"
-       image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-       image_overlay="hammer_18"
-       layout="topleft"
-       left="0"
-       name="build_btn"
-       tool_tip="Shows/hides Build Tools"
-       top="5"
-       use_ellipses="true"
-       width="36">
-        <commit_callback
-         function="Build.Toggle"
-         parameter="build" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
-     auto_resize="false"
-     follows="left|right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="40"
-     mouse_opaque="false"
-     name="search_btn_panel"
-     user_resize="false"
-     width="40">
-      <bottomtray_button
-       follows="left|right"
-       height="23"
-       image_pressed="PushButton_Press"
-       image_pressed_selected="PushButton_Selected_Press"
-       image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-       image_overlay="search_18"
-       layout="topleft"
-       left="0"
-       name="search_btn"
-       tool_tip="Shows/hides Search"
-       top="5"
-       use_ellipses="true"
-       width="36">
-        <init_callback
-         function="Button.SetFloaterToggle"
-         parameter="search" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
-     auto_resize="false"
-     follows="left|right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="40"
-     mouse_opaque="false"
-     name="world_map_btn_panel"
-     user_resize="false"
-     width="40">
-      <bottomtray_button
-       follows="left|right"
-       height="23"
-       image_pressed="PushButton_Press"
-       image_pressed_selected="PushButton_Selected_Press"
-       image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-       image_overlay="map_18"
-       layout="topleft"
-       left="0"
-       name="world_map_btn"
-       tool_tip="Shows/hides World Map"
-       top="5"
-       use_ellipses="true"
-       width="36">
-        <init_callback
-         function="Button.SetFloaterToggle"
-         parameter="world_map" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
-     auto_resize="false"
-     follows="left|right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="40"
-     mouse_opaque="false"
-     name="mini_map_btn_panel"
-     user_resize="false"
-     width="40">
-      <bottomtray_button
-       follows="left|right"
-       height="23"
-       image_pressed="PushButton_Press"
-       image_pressed_selected="PushButton_Selected_Press"
-       image_selected="PushButton_Selected_Press"
-       is_toggle="true"
-       image_overlay="minimap_18"
-       layout="topleft"
-       left="0"
-       name="mini_map_btn"
-       tool_tip="Shows/hides Mini-Map"
-       top="5"
-       use_ellipses="true"
-       width="36">
-        <init_callback
-         function="Button.SetFloaterToggle"
-         parameter="mini_map" />
-      </bottomtray_button>
-    </layout_panel>
-
-<!-- ## Zi: AO button -->
-        <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="56"
-         mouse_opaque="false"
-         name="ao_btn_panel"
-         user_resize="false"
-         width="56">
-            <bottomtray_button
-             name="ao_toggle_btn"
-             tool_tip="Enables/Disables Animation Overrider"
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             image_overlay="ao_toggle_18"
-             layout="topleft"
-             left="0"
-             top="5"
-             use_ellipses="true"
-             width="36">
-            </bottomtray_button>
-       <bottomtray_button
-        name="ao_btn"
-        tool_tip="Shows/hides Animation Overrider"
-        left_pad="0"
-        height="23"
-        width="16"
-        image_disabled="ComboButton_UpOff"
-        image_unselected="ComboButton_UpOff"
-        image_selected="ComboButton_Up_On_Selected"
-        image_pressed="ComboButton_UpSelected"
-        image_pressed_selected="ComboButton_Up_On_Selected"
-        is_toggle="true"
-        tab_stop="true">
-        <init_callback
-         function="Button.SetDockableFloaterToggle"
-         parameter="animation_overrider" />
-      </bottomtray_button>
-        </layout_panel>
-<!-- ## Zi: AO button -->
-
-    <icon
-     auto_resize="false"
-     color="Transparent"
-     follows="left|right"
-     height="10"
-     image_name="spacer24.tga"
-     layout="topleft"
-     left="0"
-     min_width="3"
-     name="after_inventory_button"
-     top="0"
-     width="3"/>
-
-    <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="40"
-         mouse_opaque="false"
-         name="bottom_sbinv"
-         user_resize="false"
-         width="40">
-            <bottomtray_button
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="false"
-             image_overlay="inventory_18"
-             layout="topleft"
-             left="0"
-             name="sidebar_inv_btn"
-             tool_tip="Shows/hides inventory"
-             top="5"
-             enabled="true"
-             use_ellipses="true"
-             width="36">
-            </bottomtray_button>
-        </layout_panel>
-
-
-
-    <layout_panel
-     follows="left|right"
-     height="30"
-     layout="topleft"
-     min_width="95"
-     mouse_opaque="false"
-     name="chiclet_list_panel"
-     top="0"
-     user_resize="false"
-     width="189">
-      <!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
-as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991-->
-      <chiclet_panel
-       chiclet_padding="4"
-       follows="left|right"
-       height="24"
-       layout="topleft"
-       left="1"
-       min_width="95"
-       mouse_opaque="false"
-       name="chiclet_list"
-       top="7"
-       width="189">
-        <button
-         auto_resize="true"
-         follows="right"
-         height="29"
-         image_hover_selected="SegmentedBtn_Left_Over"
-         image_hover_unselected="SegmentedBtn_Left_Over"
-         image_overlay="Arrow_Small_Left"
-         image_pressed="SegmentedBtn_Left_Press"
-         image_pressed_selected="SegmentedBtn_Left_Press"
-         image_selected="SegmentedBtn_Left_Off"
-         image_unselected="SegmentedBtn_Left_Off"
-         layout="topleft"
-         name="chicklet_left_scroll_button"
-         tab_stop="false"
-         top="-28"
-         visible="false"
-         width="7" />
-        <button
-         auto_resize="true"
-         follows="right"
-         height="29"
-         image_hover_selected="SegmentedBtn_Right_Over"
-         image_hover_unselected="SegmentedBtn_Right_Over"
-         image_overlay="Arrow_Small_Right"
-         image_pressed="SegmentedBtn_Right_Press"
-         image_pressed_selected="SegmentedBtn_Right_Press"
-         image_selected="SegmentedBtn_Right_Off"
-         image_unselected="SegmentedBtn_Right_Off"
-         layout="topleft"
-         name="chicklet_right_scroll_button"
-         tab_stop="false"
-         top="-28"
-         visible="false"
-         width="7" />
-      </chiclet_panel>
-    </layout_panel>
-    <layout_panel auto_resize="false"
-                  user_resize="false"
-                  width="4"
-                  min_width="4"/>
-    <layout_panel
-     auto_resize="false"
-     follows="right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="37"
-     name="im_well_panel"
-     top="0"
-     user_resize="false"
-     width="37">
-      <chiclet_im_well
-       follows="right"
-       height="28"
-       layout="topleft"
-       left="0"
-       max_displayed_count="999"
-       name="im_well"
-       top="0"
-       width="35">
-        <!--
-Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
-xml attribute           Description
-image_unselected        "Unlit" - there are no new messages
-image_selected          "Unlit" + "Selected" - there are no new messages and the Well is open
-image_pressed           "Lit" - there are new messages
-image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
-             -->
-        <button
-         auto_resize="true"
-         follows="right"
-         halign="center"
-         height="23"
-         image_overlay="Unread_IM"
-         image_overlay_alignment="center"
-         image_pressed="WellButton_Lit"
-         image_pressed_selected="WellButton_Lit_Selected"
-         image_selected="PushButton_Press"
-         label_color="Black"
-         left="0"
-         name="Unread IM messages"
-         tool_tip="Conversations"
-         width="34">
-          <init_callback
-           function="Button.SetDockableFloaterToggle"
-           parameter="im_well_window" />
-        </button>
-      </chiclet_im_well>
-    </layout_panel>
-    <layout_panel
-     auto_resize="false"
-     follows="right"
-     height="28"
-     layout="topleft"
-     min_height="28"
-     min_width="37"
-     name="notification_well_panel"
-     top="0"
-     user_resize="false"
-     width="37">
-      <chiclet_notification
-       follows="right"
-       height="23"
-       layout="topleft"
-       left="0"
-       max_displayed_count="999"
-       name="notification_well"
-       top="5"
-       width="35">
-        <button
-         auto_resize="true"
-         bottom_pad="3"
-         follows="right"
-         halign="center"
-         height="23"
-         image_overlay="Notices_Unread"
-         image_overlay_alignment="center"
-         image_pressed="WellButton_Lit"
-         image_pressed_selected="WellButton_Lit_Selected"
-         image_selected="PushButton_Press"
-         label_color="Black"
-         left="0"
-         name="Unread"
-         tool_tip="Notifications"
-         width="34">
-          <init_callback
-           function="Button.SetDockableFloaterToggle"
-           parameter="notification_well_window" />
-        </button>
-      </chiclet_notification>
-    </layout_panel>
-    <layout_panel
-       auto_resize="false"
-       user_resize="false"
-       min_width="4"
-       name="DUMMY2"
-       width="8" />
-  </layout_stack>
-</panel>