merge from viewer-public

4 files changed, 209 insertions, 155 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 2515b60868..6a90e92eca 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -6,31 +6,31 @@
      label="Sort by Name"
      layout="topleft"
      name="SortByName">
-        <menu_item_check.on_click
-         function="ParticipantList.Sort"
-         parameter="sort_by_name" />
-        <menu_item_check.on_check
+        <on_check
          function="ParticipantList.CheckItem"
          parameter="is_sorted_by_name" />
+        <on_click
+         function="ParticipantList.Sort"
+         parameter="sort_by_name" />
     </menu_item_check>
     <menu_item_check
      label="Sort by Recent Speakers"
      layout="topleft"
      name="SortByRecentSpeakers">
-        <menu_item_check.on_click
-         function="ParticipantList.Sort"
-         parameter="sort_by_recent_speakers" />
-        <menu_item_check.on_check
+        <on_check
          function="ParticipantList.CheckItem"
          parameter="is_sorted_by_recent_speakers" />
+        <on_click
+         function="ParticipantList.Sort"
+         parameter="sort_by_recent_speakers" />
     </menu_item_check>
     <menu_item_call
      label="View Profile"
      layout="topleft"
      name="View Profile">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.Profile" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_view_profile" />
     </menu_item_call>
@@ -38,9 +38,9 @@
      label="Add Friend"
      layout="topleft"
      name="Add Friend">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.AddFriend" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_add" />
     </menu_item_call>
@@ -48,9 +48,9 @@
      label="IM"
      layout="topleft"
      name="IM">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.IM" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_im" />
     </menu_item_call>
@@ -58,20 +58,19 @@
      label="Call"
      layout="topleft"
      name="Call">
-         <menu_item_call.on_click
+        <on_click
          function="Avatar.Call" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_call" />
     </menu_item_call>
     <menu_item_call
-     enabled="true"
      label="Share"
      layout="topleft"
      name="Share">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.Share" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_share" />
     </menu_item_call>
@@ -79,37 +78,38 @@
      label="Pay"
      layout="topleft"
      name="Pay">
-        <menu_item_call.on_click
+        <on_click
          function="Avatar.Pay" />
-        <menu_item_call.on_enable
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_pay" />
     </menu_item_call>
     <menu_item_separator
-        layout="topleft"
-        name="View Icons Separator" />
+     layout="topleft"
+     name="View Icons Separator" />
     <menu_item_check
-        label="View People Icons"
-        name="View Icons">
-      <on_click
-          function="ToggleControl"
-          parameter="ParticipantListShowIcons"/>
-      <on_check
-          function="CheckControl"
-          parameter="ParticipantListShowIcons" />
+     label="View People Icons"
+     layout="topleft"
+     name="View Icons">
+        <on_check
+         function="CheckControl"
+         parameter="ParticipantListShowIcons" />
+        <on_click
+         function="ToggleControl"
+         parameter="ParticipantListShowIcons" />
     </menu_item_check>
     <menu_item_separator
-        layout="topleft" />
+     layout="topleft" />
     <menu_item_check
      label="Block Voice"
      layout="topleft"
      name="Block/Unblock">
-        <menu_item_check.on_click
-         function="Avatar.BlockUnblock" />
-        <menu_item_check.on_check
+        <on_check
          function="ParticipantList.CheckItem"
          parameter="is_blocked" />
-        <menu_item_check.on_enable
+        <on_click
+         function="Avatar.BlockUnblock" />
+        <on_enable
          function="ParticipantList.EnableItem"
          parameter="can_block" />
     </menu_item_check>
@@ -126,71 +126,71 @@
          function="ParticipantList.EnableItem"
          parameter="can_mute_text" />
     </menu_item_check>
-        <menu_item_separator
-         layout="topleft" />
+    <menu_item_separator
+     layout="topleft" />
     <context_menu
      label="Moderator Options &gt;"
      layout="topleft"
-     name="Moderator Options" >
-    <menu_item_check
-     label="Allow text chat"
-     layout="topleft"
-     name="AllowTextChat">
-        <on_check
-         function="ParticipantList.CheckItem"
-         parameter="is_allowed_text_chat" />
-        <on_click
-         function="ParticipantList.ToggleAllowTextChat" />
-        <on_enable
-         function="ParticipantList.EnableItem"
-         parameter="can_allow_text_chat" />
-    </menu_item_check>
-    <menu_item_separator
-     layout="topleft"
-     name="moderate_voice_separator" />
-    <menu_item_call
-     label="Mute this participant"
-     layout="topleft"
-     name="ModerateVoiceMuteSelected">
-        <on_click
-         function="ParticipantList.ModerateVoice"
-         parameter="selected" />
-        <on_enable
-         function="ParticipantList.EnableItem.Moderate"
-         parameter="can_moderate_voice" />
-    </menu_item_call>
-    <menu_item_call
-     label="Mute everyone else"
-     layout="topleft"
-     name="ModerateVoiceMuteOthers">
-        <on_click
-         function="ParticipantList.ModerateVoice"
-         parameter="others" />
-        <on_enable
-         function="ParticipantList.EnableItem.Moderate"
-         parameter="can_moderate_voice" />
-    </menu_item_call>
-    <menu_item_call
-     label="Unmute this participant"
-     layout="topleft"
-     name="ModerateVoiceUnMuteSelected">
-        <on_click
-         function="ParticipantList.ModerateVoice"
-         parameter="selected" />
-        <on_enable
-         function="ParticipantList.EnableItem.Moderate"
-         parameter="can_moderate_voice" />
-    </menu_item_call>
-    <menu_item_call
-     label="Unmute everyone else"
-     layout="topleft"
-     name="ModerateVoiceUnMuteOthers">
-        <on_click
-         function="ParticipantList.ModerateVoice"
-         parameter="others" />
-        <on_enable
-         function="ParticipantList.EnableItem.Moderate"
-         parameter="can_moderate_voice" />
-    </menu_item_call>
+     name="Moderator Options">
+        <menu_item_check
+         label="Allow text chat"
+         layout="topleft"
+         name="AllowTextChat">
+            <on_check
+             function="ParticipantList.CheckItem"
+             parameter="is_allowed_text_chat" />
+            <on_click
+             function="ParticipantList.ToggleAllowTextChat" />
+            <on_enable
+             function="ParticipantList.EnableItem"
+             parameter="can_allow_text_chat" />
+        </menu_item_check>
+        <menu_item_separator
+         layout="topleft"
+         name="moderate_voice_separator" />
+        <menu_item_call
+         label="Mute this participant"
+         layout="topleft"
+         name="ModerateVoiceMuteSelected">
+            <on_click
+             function="ParticipantList.ModerateVoice"
+             parameter="selected" />
+            <on_enable
+             function="ParticipantList.EnableItem.Moderate"
+             parameter="can_moderate_voice" />
+        </menu_item_call>
+        <menu_item_call
+         label="Mute everyone else"
+         layout="topleft"
+         name="ModerateVoiceMuteOthers">
+            <on_click
+             function="ParticipantList.ModerateVoice"
+             parameter="others" />
+            <on_enable
+             function="ParticipantList.EnableItem.Moderate"
+             parameter="can_moderate_voice" />
+        </menu_item_call>
+        <menu_item_call
+         label="Unmute this participant"
+         layout="topleft"
+         name="ModerateVoiceUnMuteSelected">
+            <on_click
+             function="ParticipantList.ModerateVoice"
+             parameter="selected" />
+            <on_enable
+             function="ParticipantList.EnableItem.Moderate"
+             parameter="can_moderate_voice" />
+        </menu_item_call>
+        <menu_item_call
+         label="Unmute everyone else"
+         layout="topleft"
+         name="ModerateVoiceUnMuteOthers">
+            <on_click
+             function="ParticipantList.ModerateVoice"
+             parameter="others" />
+            <on_enable
+             function="ParticipantList.EnableItem.Moderate"
+             parameter="can_moderate_voice" />
+        </menu_item_call>
     </context_menu>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 479629f6ea..19fe2ea874 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -210,9 +210,23 @@ Maximum 200 per group daily
         <button
          follows="left|top"
          layout="topleft"
+         left="20"
+         top_delta="50"
+         height="23"
+         width="100"
+         name="open_inventory"
+         label="Inventory"
+         tool_tip="Open Inventory">
+			<button.init_callback
+				 function="Button.SetFloaterToggle"
+				 parameter="inventory"/>
+		</button>
+        <button
+         follows="left|top"
+         layout="topleft"
          left="140"
          name="remove_attachment"
-         top_delta="50"
+         top_delta="0"
                  height="18"
                  image_selected="TrashItem_Press"
                  image_unselected="TrashItem_Off"
@@ -230,7 +244,7 @@ Maximum 200 per group daily
          name="send_notice"
          width="100" />
       <group_drop_target
-         height="95"
+         height="75"
          top="160"
          left="10"
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 46625144e1..d65b86f007 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -84,7 +84,7 @@
      sort_order_setting="InventorySortOrder"
      top="16"
      width="288" />
-    <inventory_panel
+    <recent_inventory_panel
         bg_opaque_color="DkGray2"
    bg_alpha_color="DkGray2"
    background_visible="true"
@@ -100,62 +100,94 @@
      name="Recent Items"
      width="290" />
   </tab_container>
-
-  <panel
-     background_visible="true"
+  <layout_stack
+   animate="false"
+   background_visible="true"
    bevel_style="none"
+   border_size="0"
    follows="left|right|bottom"
-   height="27"
+   height="25"
    layout="topleft"
-   top_pad="-1"
+   orientation="horizontal"
+   top_pad="0"
    left="10"
    name="bottom_panel"
-   width="310">
-    <button
-     follows="bottom|left"
-     tool_tip="Show additional options"
-     height="25"
-     image_hover_unselected="Toolbar_Left_Over"
-     image_overlay="OptionsMenu_Off"
-     image_selected="Toolbar_Left_Selected"
-     image_unselected="Toolbar_Left_Off"
-     layout="topleft"
-     left="0"
-     name="options_gear_btn"
-     top="1"
-     width="31" />
-    <button
-     follows="bottom|left"
-     height="25"
-     image_hover_unselected="Toolbar_Middle_Over"
-     image_overlay="AddItem_Off"
-     image_selected="Toolbar_Middle_Selected"
-     image_unselected="Toolbar_Middle_Off"
-     layout="topleft"
-     left_pad="1"
-     name="add_btn"
-     tool_tip="Add new item"
-     width="31" />
-    <icon
-     follows="bottom|left"
-     height="25"
-     image_name="Toolbar_Middle_Off"
-     layout="topleft"
-     left_pad="1"
-     name="dummy_icon"
-     width="209"
-       />
-    <dnd_button
-     follows="bottom|left"
-     height="25"
-     image_hover_unselected="Toolbar_Right_Over"
-     image_overlay="TrashItem_Off"
-     image_selected="Toolbar_Right_Selected"
-     image_unselected="Toolbar_Right_Off"
-     left_pad="1"
-     layout="topleft"
-     name="trash_btn"
-     tool_tip="Remove selected item"
-     width="31"/>
-  </panel>
+   width="307">
+      <layout_panel
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       name="options_gear_btn_panel"
+       width="32">
+          <button
+           follows="bottom|left"
+           tool_tip="Show additional options"
+           height="25"
+           image_hover_unselected="Toolbar_Left_Over"
+           image_overlay="OptionsMenu_Off"
+           image_selected="Toolbar_Left_Selected"
+           image_unselected="Toolbar_Left_Off"
+           layout="topleft"
+           left="0"
+           name="options_gear_btn"
+           top="0"
+           width="31" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       name="add_btn_panel"
+       width="32">
+          <button
+           follows="bottom|left"
+           height="25"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="AddItem_Off"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           name="add_btn"
+           tool_tip="Add new item"
+           top="0"
+           width="31" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="true"
+       height="25"
+       layout="topleft"
+       name="dummy_panel"
+       width="212">
+          <icon
+           follows="bottom|left|right"
+           height="25"
+           image_name="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           top="0"
+           name="dummy_icon"
+           width="211" />
+      </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       name="trash_btn_panel"
+       width="31">
+          <dnd_button
+           follows="bottom|left"
+           height="25"
+           image_hover_unselected="Toolbar_Right_Over"
+           image_overlay="TrashItem_Off"
+           image_selected="Toolbar_Right_Selected"
+           image_unselected="Toolbar_Right_Off"
+           left="0"
+           layout="topleft"
+           name="trash_btn"
+           tool_tip="Remove selected item"
+           top="0"
+           width="31"/>
+      </layout_panel>
+  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index e74c70789f..6a3c148456 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -94,6 +94,14 @@ width="333">
       name="edit_outfit_btn"
       top="7"
       width="30" />
+      <loading_indicator
+      follows="left|top"
+      height="24"
+      layout="topleft"
+      left="268"
+      name="wearables_loading_indicator"
+      top="6"
+      width="24" />
    </panel>
    <filter_editor
    height="23"