merge from viewer-trunk

1 files changed, 196 insertions, 287 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 4b622691b3..c34a367c32 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -1,401 +1,320 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+ mouse_opaque="true"
  background_visible="true"
  bg_alpha_color="DkGray"
  bg_opaque_color="DkGray"
- chrome="true"
  follows="left|bottom|right"
  height="33"
  layout="topleft"
  left="0"
  name="bottom_tray"
  top="28"
- width="1310">
-    <string
-     name="SpeakBtnToolTip"
-     value="Turns microphone on/off" />
-    <string
-     name="VoiceControlBtnToolTip"
-     value="Shows/hides voice control panel" />
+ chrome="true"
+ border_visible="false"
+ width="1000">
+  <string name="SpeakBtnToolTip">Turns microphone on/off</string>
+  <string name="VoiceControlBtnToolTip">Shows/hides voice control panel</string>
     <layout_stack
+     mouse_opaque="false"
      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">
+     width="1000">
         <icon
          auto_resize="false"
          follows="left|right"
          height="10"
          image_name="spacer24.tga"
          layout="topleft"
-         left="0"
          min_width="2"
+         left="0"
          top="0"
          width="2" />
         <layout_panel
+ 	mouse_opaque="false"
          auto_resize="false"
-         filename="panel_nearby_chat_bar.xml"
          follows="left|right"
          height="28"
          layout="topleft"
          left="0"
-         max_width="320"
          min_height="23"
-         min_width="214"
-         mouse_opaque="false"
-         name="chat_bar"
+         width="310"
          top="4"
-         user_resize="true"
-         width="308" />
-        <!--
-        There is resize bar between chatbar and Speak button. It has 2px width (is is set as 2*UIResizeBarOverlap)
-        -->
+         max_width="320"
+         min_width="216"
+         name="chat_bar"
+         user_resize="false"
+         filename="panel_nearby_chat_bar.xml" />
         <layout_panel
+         mouse_opaque="false"
          auto_resize="false"
          follows="right"
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="59"
-         mouse_opaque="false"
-         name="speak_panel"
+         width="105"
          top_delta="0"
-         user_resize="true"
-         width="110">
-            <talk_button
-             follows="left|right"
-             height="23"
-             layout="topleft"
-             left="2"
-             name="talk"
-             top="5"
-             width="105">
-                <show_button
-                 tab_stop="true">
-                    <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="voice_controls" />
-                </show_button>
-                <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
-                 & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
-                <speak_button
-                 halign="center"
-                 label="Speak"
-                 label_selected="Speak"
-                 name="speak_btn"
-                 pad_right="20"
-                 tab_stop="true"
-                 use_ellipses="true" />
-            </talk_button>
+         min_width="54"
+         name="speak_panel"
+         user_resize="false">
+          <talk_button
+           follows="left|right"
+           height="23"
+           speak_button.tab_stop="true"
+           show_button.tab_stop="true"
+           layout="topleft"
+           left="0"
+           name="talk"
+           top="5"
+          width="105">
+            <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
+             & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
+  <speak_button
+    halign="center"
+    name="speak_btn"
+    label="Speak"
+    label_selected="Speak"
+    pad_right="22"
+    use_ellipses="true"
+    />
+              <show_button>
+                  <show_button.init_callback
+                   function="Button.SetDockableFloaterToggle"
+                   parameter="voice_controls" />
+              </show_button>
+          </talk_button>
         </layout_panel>
+        <icon
+            auto_resize="false"
+            follows="left|right"
+            height="10"
+            image_name="spacer24.tga"
+            layout="topleft"
+            left="0"
+            name="after_speak_panel"
+            min_width="3"
+            top="0"
+            width="3"/>
         <layout_panel
+         mouse_opaque="false"
          auto_resize="false"
          follows="right"
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="65"
-         mouse_opaque="false"
-         name="gesture_panel"
+         width="82"
          top_delta="0"
-         user_resize="false"
-         width="85">
-            <gesture_combo_list
-             follows="left|right"
-             height="23"
-             label="Gesture"
-             layout="topleft"
-             left="0"
-             name="Gesture"
-             tool_tip="Shows/hides gestures"
-             top="5"
-             width="82">
-                <combo_button
-                 pad_right="10"
-                 use_ellipses="true" />
-                <combo_list
-                 page_lines="17" />
-            </gesture_combo_list>
+         min_width="62"
+         name="gesture_panel"
+         user_resize="false">
+         <gesture_combo_list
+          follows="left|right"
+          height="23"
+          label="Gesture"
+          layout="topleft"
+          name="Gesture"
+          left="0"
+          top="5"
+          width="82"
+          tool_tip="Shows/hides gestures">
+             <gesture_combo_list.combo_button
+              pad_right="10"
+              use_ellipses="true" />
+         </gesture_combo_list>
         </layout_panel>
+		 <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         min_width="3"
+         name="after_gesture_panel"
+         top="0"
+         width="3"/>
         <layout_panel
+         mouse_opaque="false"
          auto_resize="false"
          follows="right"
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="52"
-         mouse_opaque="false"
          name="movement_panel"
          user_resize="false"
-         width="83">
+         width="80"
+         min_width="49">
             <button
+                 image_selected="PushButton_Selected_Press"
+                 image_pressed="PushButton_Press"
+		 image_pressed_selected="PushButton_Selected_Press"
              follows="left|right"
              height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
+             use_ellipses="true"
              is_toggle="true"
              label="Move"
              layout="topleft"
              name="movement_btn"
              tool_tip="Shows/hides movement controls"
              top="5"
-             use_ellipses="true"
              width="80">
-                <init_callback
+                <button.init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="moveview" />
             </button>
         </layout_panel>
+         <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         min_width="3"
+         name="after_movement_panel"
+         top="0"
+         width="3"/>
         <layout_panel
+         mouse_opaque="false"
          auto_resize="false"
          follows="left|right"
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="52"
-         mouse_opaque="false"
+         min_width="49"
          name="cam_panel"
          user_resize="false"
-         width="83">
+         width="80">
             <button
+                 image_selected="PushButton_Selected_Press"
+                 image_pressed="PushButton_Press"
+		 image_pressed_selected="PushButton_Selected_Press"
              follows="left|right"
              height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
+             use_ellipses="true"
              is_toggle="true"
              label="View"
              layout="topleft"
              left="0"
-             name="camera_btn"
              tool_tip="Shows/hides camera controls"
              top="5"
-             use_ellipses="true"
+             name="camera_btn"
              width="80">
-                <init_callback
+                <button.init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="camera" />
             </button>
         </layout_panel>
-        <layout_panel
+        <icon
          auto_resize="false"
+         color="0 0 0 0"
          follows="left|right"
-         height="28"
+         height="10"
+         image_name="spacer24.tga"
          layout="topleft"
-         min_width="40"
-         mouse_opaque="false"
-         name="snapshot_panel"
-         user_resize="false"
-         width="39">
-            <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" />
-            </button>
-        </layout_panel>
+         left="0"
+         min_width="3"
+         name="after_cam_panel"
+         top="0"
+         width="3"/>
         <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="52"
          mouse_opaque="false"
-         name="build_btn_panel"
-         user_resize="false"
-         width="83">
-<!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
-Disabled for now.
--->
-            <button
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             label="Build"
-             layout="topleft"
-             left="0"
-             name="build_btn"
-             tool_tip="Shows/hides Build Tools"
-             top="5"
-             use_ellipses="true"
-             width="80">
-                <commit_callback
-                 function="Build.Toggle"
-                 parameter="build" />
-            </button>
-        </layout_panel>
-        <layout_panel
          auto_resize="false"
          follows="left|right"
          height="28"
          layout="topleft"
-         min_height="28"
-         min_width="52"
-         mouse_opaque="false"
-         name="search_btn_panel"
-         user_resize="false"
-         width="83">
+         min_width="40"
+         name="snapshot_panel"
+         width="40">
             <button
-             follows="left|right"
+			 follows="left|right"
              height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
              image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             label="Search"
-             layout="topleft"
-             left="0"
-             name="search_btn"
-             tool_tip="Shows/hides Search"
-             top="5"
-             use_ellipses="true"
-             width="80">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="search" />
-            </button>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="52"
-         mouse_opaque="false"
-         name="world_map_btn_panel"
-         user_resize="false"
-         width="83">
-            <button
-             follows="left|right"
-             height="23"
              image_pressed="PushButton_Press"
              image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             label="Map"
-             layout="topleft"
              left="0"
-             name="world_map_btn"
-             tool_tip="Shows/hides World Map"
-             top="5"
-             use_ellipses="true"
-             width="80">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="world_map" />
-            </button>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="52"
-         mouse_opaque="false"
-         name="mini_map_btn_panel"
-         user_resize="false"
-         width="83">
-            <button
-             follows="left|right"
-             height="23"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
-             is_toggle="true"
-             label="Mini-Map"
+             label=""
              layout="topleft"
-             left="0"
-             name="mini_map_btn"
-             tool_tip="Shows/hides Mini-Map"
+             name="snapshots"
+             width="36"
              top="5"
-             use_ellipses="true"
-             width="80">
-                <init_callback
-                 function="Button.SetFloaterToggle"
-                 parameter="mini_map" />
-            </button>
-        </layout_panel>
+             is_toggle="true"
+             image_overlay="Snapshot_Off"
+             tool_tip="Take snapshot">
+				<button.init_callback
+				 function="Button.SetFloaterToggle"
+				 parameter="snapshot" />
+			</button>
+		</layout_panel>
         <layout_panel
+         mouse_opaque="false"
          follows="left|right"
          height="30"
          layout="topleft"
-         min_width="95"
-         mouse_opaque="false"
-         name="chiclet_list_panel"
          top="0"
+         name="chiclet_list_panel"
+         width="189"
+         min_width="95"
          user_resize="false"
-         width="189">
+         auto_resize="true">
 <!--*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"
+	    mouse_opaque="false"
              follows="left|right"
              height="24"
              layout="topleft"
              left="1"
              min_width="95"
-             mouse_opaque="false"
              name="chiclet_list"
              top="7"
+             chiclet_padding="4"
+             scrolling_offset="40"
              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"
+		 image_hover_selected="SegmentedBtn_Left_Over"
+		 image_hover_unselected="SegmentedBtn_Left_Over"
+		 image_pressed="SegmentedBtn_Left_Press"
+		 image_pressed_selected="SegmentedBtn_Left_Press"
+		 image_overlay="Arrow_Small_Left"
                  layout="topleft"
                  name="chicklet_left_scroll_button"
+        scale_image="true"
                  tab_stop="false"
-                 top="-28"
+                 top="-4"
+                 right_pad="2"
                  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"
+		 image_hover_selected="SegmentedBtn_Right_Over"
+		 image_hover_unselected="SegmentedBtn_Right_Over"
+		 image_pressed="SegmentedBtn_Right_Press"
+		 image_pressed_selected="SegmentedBtn_Right_Press"
+		 image_overlay="Arrow_Small_Right"
                  layout="topleft"
                  name="chicklet_right_scroll_button"
+        scale_image="true"
                  tab_stop="false"
-                 top="-28"
+                 top="-4"
                  visible="false"
                  width="7" />
             </chiclet_panel>
@@ -411,24 +330,25 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          min_width="4"
          name="DUMMY"
          top="0"
-         width="4" />
+         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">
+         name="im_well_panel"
+         width="37"
+         min_width="37"
+         user_resize="false">
             <chiclet_im_well
+             max_displayed_count="99"
+             flash_period="0.3"
              follows="right"
              height="28"
              layout="topleft"
              left="0"
-             max_displayed_count="99"
              name="im_well"
              top="0"
              width="35">
@@ -454,8 +374,8 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  left="0"
                  name="Unread IM messages"
                  tool_tip="Conversations"
-                 width="34">
-                    <init_callback
+                 width="34" >
+                    <button.init_callback
                      function="Button.SetDockableFloaterToggle"
                      parameter="im_well_window" />
                 </button>
@@ -467,12 +387,13 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="37"
-         name="notification_well_panel"
          top="0"
-         user_resize="false"
-         width="37">
+         name="notification_well_panel"
+         width="37"
+         min_width="37"
+         user_resize="false">
             <chiclet_notification
+             flash_period="0.25"
              follows="right"
              height="23"
              layout="topleft"
@@ -481,39 +402,27 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              name="notification_well"
              top="5"
              width="35">
-                <button
-                 auto_resize="true"
+              <button
                  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>
+              auto_resize="true"
+               halign="center"
+               height="23"
+               follows="right"
+                label_color="Black"
+               left="0"
+               name="Unread"
+               image_overlay="Notices_Unread"
+               image_overlay_alignment="center"
+               tool_tip="Notifications"
+               width="34" >
+                  <button.init_callback
+                   function="Button.SetDockableFloaterToggle"
+                   parameter="notification_well_window" />
+              </button>
+	    </chiclet_notification>
         </layout_panel>
-      <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         min_width="4"
-         name="DUMMY2"
-         top="0"
-         width="8" />
     </layout_stack>
 </panel>