From 1bb46c7384f6532da8f0315f61b8613bd0b9b717 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 16 Feb 2011 17:02:06 -0800
Subject: SOCIAL-544 PARTIAL move skylight skin to viewer repo

---
 .../skins/minimal/xui/en/floater_camera.xml        | 257 +++++++++
 .../skins/minimal/xui/en/floater_help_browser.xml  |  52 ++
 .../skins/minimal/xui/en/floater_media_browser.xml | 205 ++++++++
 .../skins/minimal/xui/en/floater_nearby_chat.xml   |  52 ++
 .../skins/minimal/xui/en/inspect_avatar.xml        | 135 +++++
 .../skins/minimal/xui/en/inspect_object.xml        | 116 ++++
 indra/newview/skins/minimal/xui/en/main_view.xml   | 236 +++++++++
 .../minimal/xui/en/menu_add_wearable_gear.xml      |   2 +
 .../skins/minimal/xui/en/menu_attachment_other.xml |  35 ++
 .../skins/minimal/xui/en/menu_attachment_self.xml  |   2 +
 .../skins/minimal/xui/en/menu_avatar_icon.xml      |   2 +
 .../skins/minimal/xui/en/menu_avatar_other.xml     |  25 +
 .../skins/minimal/xui/en/menu_avatar_self.xml      |   2 +
 .../skins/minimal/xui/en/menu_bottomtray.xml       |   2 +
 .../skins/minimal/xui/en/menu_cof_attachment.xml   |   2 +
 .../skins/minimal/xui/en/menu_cof_body_part.xml    |   2 +
 .../skins/minimal/xui/en/menu_cof_clothing.xml     |   2 +
 .../newview/skins/minimal/xui/en/menu_cof_gear.xml |   2 +
 indra/newview/skins/minimal/xui/en/menu_edit.xml   |  90 ++++
 .../skins/minimal/xui/en/menu_favorites.xml        |   2 +
 .../skins/minimal/xui/en/menu_gesture_gear.xml     |   2 +
 .../skins/minimal/xui/en/menu_group_plus.xml       |   2 +
 .../skins/minimal/xui/en/menu_hide_navbar.xml      |   2 +
 .../skins/minimal/xui/en/menu_im_well_button.xml   |   2 +
 .../skins/minimal/xui/en/menu_imchiclet_adhoc.xml  |   2 +
 .../skins/minimal/xui/en/menu_imchiclet_group.xml  |   2 +
 .../skins/minimal/xui/en/menu_imchiclet_p2p.xml    |   2 +
 .../minimal/xui/en/menu_inspect_avatar_gear.xml    |   2 +
 .../minimal/xui/en/menu_inspect_object_gear.xml    |   2 +
 .../minimal/xui/en/menu_inspect_self_gear.xml      |   2 +
 .../minimal/xui/en/menu_inv_offer_chiclet.xml      |   2 +
 .../skins/minimal/xui/en/menu_inventory.xml        |   2 +
 .../skins/minimal/xui/en/menu_inventory_add.xml    |   2 +
 .../minimal/xui/en/menu_inventory_gear_default.xml |   2 +
 indra/newview/skins/minimal/xui/en/menu_land.xml   |   2 +
 .../newview/skins/minimal/xui/en/menu_landmark.xml |   2 +
 indra/newview/skins/minimal/xui/en/menu_login.xml  |   2 +
 .../newview/skins/minimal/xui/en/menu_mini_map.xml |   2 +
 indra/newview/skins/minimal/xui/en/menu_navbar.xml |   2 +
 .../skins/minimal/xui/en/menu_nearby_chat.xml      |   2 +
 .../xui/en/menu_notification_well_button.xml       |   2 +
 indra/newview/skins/minimal/xui/en/menu_object.xml |  40 ++
 .../skins/minimal/xui/en/menu_object_icon.xml      |   2 +
 .../skins/minimal/xui/en/menu_outfit_gear.xml      |   2 +
 .../skins/minimal/xui/en/menu_outfit_tab.xml       |   2 +
 .../skins/minimal/xui/en/menu_participant_list.xml |   2 +
 .../xui/en/menu_people_friends_view_sort.xml       |   2 +
 .../skins/minimal/xui/en/menu_people_groups.xml    |   2 +
 .../xui/en/menu_people_groups_view_sort.xml        |   2 +
 .../skins/minimal/xui/en/menu_people_nearby.xml    |   2 +
 .../xui/en/menu_people_nearby_multiselect.xml      |   2 +
 .../xui/en/menu_people_nearby_view_sort.xml        |   2 +
 .../xui/en/menu_people_recent_view_sort.xml        |   2 +
 indra/newview/skins/minimal/xui/en/menu_picks.xml  |   2 +
 .../skins/minimal/xui/en/menu_picks_plus.xml       |   2 +
 indra/newview/skins/minimal/xui/en/menu_place.xml  |   2 +
 .../skins/minimal/xui/en/menu_place_add_button.xml |   2 +
 .../minimal/xui/en/menu_places_gear_folder.xml     |   2 +
 .../minimal/xui/en/menu_places_gear_landmark.xml   |   2 +
 .../skins/minimal/xui/en/menu_profile_overflow.xml |   2 +
 .../skins/minimal/xui/en/menu_save_outfit.xml      |   2 +
 .../skins/minimal/xui/en/menu_script_chiclet.xml   |   2 +
 indra/newview/skins/minimal/xui/en/menu_slurl.xml  |   2 +
 .../minimal/xui/en/menu_teleport_history_gear.xml  |   2 +
 .../minimal/xui/en/menu_teleport_history_item.xml  |   2 +
 .../minimal/xui/en/menu_teleport_history_tab.xml   |   2 +
 .../skins/minimal/xui/en/menu_text_editor.xml      |   2 +
 .../skins/minimal/xui/en/menu_topinfobar.xml       |   2 +
 .../skins/minimal/xui/en/menu_url_agent.xml        |   2 +
 .../skins/minimal/xui/en/menu_url_group.xml        |   2 +
 .../newview/skins/minimal/xui/en/menu_url_http.xml |   2 +
 .../skins/minimal/xui/en/menu_url_inventory.xml    |   2 +
 .../newview/skins/minimal/xui/en/menu_url_map.xml  |   2 +
 .../skins/minimal/xui/en/menu_url_objectim.xml     |   2 +
 .../skins/minimal/xui/en/menu_url_parcel.xml       |   2 +
 .../skins/minimal/xui/en/menu_url_slapp.xml        |   2 +
 .../skins/minimal/xui/en/menu_url_slurl.xml        |   2 +
 .../skins/minimal/xui/en/menu_url_teleport.xml     |   2 +
 indra/newview/skins/minimal/xui/en/menu_viewer.xml |  71 +++
 .../minimal/xui/en/menu_wearable_list_item.xml     |   2 +
 .../skins/minimal/xui/en/menu_wearing_gear.xml     |   2 +
 .../skins/minimal/xui/en/menu_wearing_tab.xml      |   2 +
 .../minimal/xui/en/notification_visibility.xml     |  32 ++
 .../skins/minimal/xui/en/panel_bottomtray.xml      | 412 +++++++++++++++
 .../minimal/xui/en/panel_im_control_panel.xml      |  27 +
 indra/newview/skins/minimal/xui/en/panel_login.xml | 188 +++++++
 .../skins/minimal/xui/en/panel_navigation_bar.xml  |  97 ++++
 .../minimal/xui/en/panel_prim_media_controls.xml   | 581 +++++++++++++++++++++
 .../skins/minimal/xui/en/panel_progress.xml        |  21 +
 89 files changed, 2812 insertions(+)
 create mode 100644 indra/newview/skins/minimal/xui/en/floater_camera.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/floater_help_browser.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/floater_media_browser.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/inspect_avatar.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/inspect_object.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/main_view.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_add_wearable_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_attachment_self.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_avatar_icon.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_avatar_other.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_avatar_self.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_bottomtray.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_cof_attachment.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_cof_body_part.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_cof_clothing.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_cof_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_edit.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_favorites.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_gesture_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_group_plus.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_hide_navbar.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_im_well_button.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_imchiclet_adhoc.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_imchiclet_group.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_imchiclet_p2p.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_inv_offer_chiclet.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_inventory.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_inventory_add.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_inventory_gear_default.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_land.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_landmark.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_login.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_mini_map.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_navbar.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_nearby_chat.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_notification_well_button.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_object.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_object_icon.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_outfit_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_outfit_tab.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_participant_list.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_people_friends_view_sort.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_people_groups.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_people_groups_view_sort.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_people_nearby.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_people_nearby_multiselect.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_people_nearby_view_sort.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_people_recent_view_sort.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_picks.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_picks_plus.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_place.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_place_add_button.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_places_gear_folder.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_places_gear_landmark.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_profile_overflow.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_save_outfit.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_script_chiclet.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_slurl.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_teleport_history_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_teleport_history_item.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_teleport_history_tab.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_text_editor.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_topinfobar.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_agent.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_group.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_http.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_inventory.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_map.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_objectim.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_parcel.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_slapp.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_slurl.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_url_teleport.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_viewer.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_wearable_list_item.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_wearing_gear.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/menu_wearing_tab.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/notification_visibility.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_login.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_progress.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/floater_camera.xml b/indra/newview/skins/minimal/xui/en/floater_camera.xml
new file mode 100644
index 0000000000..62276199e5
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/floater_camera.xml
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_dock="true"
+ can_minimize="true"
+ can_close="false"
+ follows="bottom"
+ height="164"
+ layout="topleft"
+ name="camera_floater"
+ save_rect="true"
+ save_visibility="true"
+ save_dock_state="true"
+ single_instance="true"
+ width="228">
+    <floater.string
+     name="rotate_tooltip">
+        Rotate Camera Around Focus
+    </floater.string>
+    <floater.string
+     name="zoom_tooltip">
+        Zoom Camera Towards Focus
+    </floater.string>
+    <floater.string
+     name="move_tooltip">
+        Move Camera Up and Down, Left and Right
+    </floater.string>
+    <floater.string
+     name="camera_modes_title">
+        Camera modes
+    </floater.string>
+    <floater.string
+     name="pan_mode_title">
+       Orbit Zoom Pan
+    </floater.string>
+    <floater.string
+     name="presets_mode_title">
+        Preset Views
+    </floater.string>
+    <floater.string
+     name="free_mode_title">
+        View Object
+    </floater.string>
+    <panel
+     border="false"
+     height="123"
+     layout="topleft"
+     left="2"
+     top="0"
+     mouse_opaque="false"
+     name="controls"
+     width="226">
+       <panel
+         color="Transparent"
+         follows="all"
+         height="102"
+         layout="topleft"
+         left="8"
+         name="preset_views_list"
+         opaque="true"
+         top="24"
+         width="212"
+         visible="false">
+        <panel_camera_item
+          name="front_view">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="front_view" />
+          <panel_camera_item.picture
+            image_name="Cam_Preset_Front_Off" />
+          <panel_camera_item.selected_picture
+            image_name="Cam_Preset_Front_On" />
+          <panel_camera_item.text
+            name="front_view_text">
+            Front View
+          </panel_camera_item.text>
+        </panel_camera_item>
+        <panel_camera_item
+          name="group_view"
+          top_pad="4">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="group_view" />
+          <panel_camera_item.picture
+            image_name="Cam_Preset_Side_Off" />
+          <panel_camera_item.selected_picture
+            image_name="Cam_Preset_Side_On" />
+          <panel_camera_item.text
+            name="side_view_text">
+            Side View
+          </panel_camera_item.text>
+        </panel_camera_item>
+        <panel_camera_item
+          name="rear_view"
+          layout="topleft"
+          top_pad="4">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="rear_view" />
+          <panel_camera_item.picture
+            image_name="Cam_Preset_Back_Off" />
+          <panel_camera_item.selected_picture
+            image_name="Cam_Preset_Back_On" />
+          <panel_camera_item.text
+            name="rear_view_text">
+            Rear View
+          </panel_camera_item.text>
+        </panel_camera_item>
+      </panel>
+      <panel
+          color="Transparent"
+          follows="all"
+          height="68"
+          item_pad="4"
+          layout="topleft"
+          left="8"
+          name="camera_modes_list"
+          opaque="true"
+          top="24"
+          width="212"
+          visible="false">
+        <panel_camera_item
+          name="object_view">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="object_view" />
+          <panel_camera_item.text
+            name="object_view_text">
+            Object View
+          </panel_camera_item.text>
+          <panel_camera_item.picture
+            image_name="Object_View_Off" />
+          <panel_camera_item.selected_picture
+            image_name="Object_View_On" />
+        </panel_camera_item>
+        <panel_camera_item
+          name="mouselook_view"
+          layout="topleft">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="mouselook_view" />
+          <panel_camera_item.text
+            name="mouselook_view_text">
+            Mouselook View
+          </panel_camera_item.text>
+          <panel_camera_item.picture
+            image_name="MouseLook_View_Off" />
+          <panel_camera_item.selected_picture
+            image_name="MouseLook_View_On" />
+        </panel_camera_item>
+      </panel>
+         <!--TODO: replace + - images -->
+         <panel
+            border="false"
+            class="camera_zoom_panel"
+            height="114"
+            layout="topleft"
+            left="0"
+            mouse_opaque="false"
+            name="zoom"
+            top="20"
+            width="226">
+           <joystick_rotate
+              follows="top|left"
+              height="78"
+              image_selected="Cam_Rotate_In"
+              image_unselected="Cam_Rotate_Out"
+              layout="topleft"
+              left="7"
+              mouse_opaque="false"
+              name="cam_rotate_stick"
+              quadrant="left"
+              scale_image="false"
+              sound_flags="3"
+              visible="true"
+              tool_tip="Orbit camera around focus"
+              top="20"
+              width="78">
+              <commit_callback
+	        function="Camera.rotate" />
+	      <mouse_held_callback
+	        function="Camera.rotate" />         
+            </joystick_rotate>
+           <button
+              follows="top|left"
+              height="18"
+              image_disabled="AddItem_Disabled"
+              image_selected="AddItem_Press"
+              image_unselected="AddItem_Off"
+              layout="topleft"
+              left_pad="14" 
+              name="zoom_plus_btn"
+              width="18"
+              top="18">
+             <commit_callback
+                function="Zoom.plus" />
+             <mouse_held_callback
+                function="Zoom.plus" />
+           </button>
+           <slider_bar
+              height="50"
+              layout="topleft"
+              name="zoom_slider"
+              orientation="vertical"
+              tool_tip="Zoom camera toward focus"
+              top_pad="0"
+              min_val="0"
+              max_val="1" 
+              width="18">
+             <commit_callback function="Slider.value_changed"/>
+           </slider_bar>
+           <button
+              follows="top|left"
+              height="18"
+              image_disabled="MinusItem_Disabled"
+              image_selected="MinusItem_Press"
+              image_unselected="MinusItem_Off"
+              layout="topleft"
+              name="zoom_minus_btn"
+              top_pad="0"
+              width="18">
+             <commit_callback
+                function="Zoom.minus" />
+             <mouse_held_callback
+                function="Zoom.minus" />
+           </button>
+         <joystick_track
+         follows="top|left"
+         height="78"
+         image_selected="Cam_Tracking_In"
+         image_unselected="Cam_Tracking_Out"
+         layout="topleft"
+         left="133"
+         name="cam_track_stick"
+         quadrant="left"
+         scale_image="false"
+         sound_flags="3"
+         tool_tip="Move camera up and down, left and right"
+         top="20"
+         width="78">
+         <commit_callback
+           function="Camera.track" />
+         <mouse_held_callback
+            function="Camera.track" />         
+         </joystick_track>
+        </panel>
+    </panel>
+    <panel
+     border="false"
+     height="42"
+     layout="topleft"
+     left="2"
+     top_pad="0"
+     name="buttons"
+     width="226">
+    </panel>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml
new file mode 100644
index 0000000000..eddfe41c25
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ can_minimize="false" 
+ height="360"
+ layout="topleft"
+ min_height="360"
+ left="645"
+ top="10" 
+ min_width="300"
+ name="floater_help_browser"
+ save_rect="true"
+ single_instance="true"
+ title="HOW TO"
+ width="300">
+    <floater.string
+     name="loading_text">
+        Loading...
+    </floater.string>
+    <floater.string
+     name="done_text">
+    </floater.string>
+    <layout_stack
+     bottom="360"
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="5"
+     orientation="vertical" 
+     name="stack1"
+     top="20"
+     width="290">
+        <layout_panel
+         layout="topleft"
+         left_delta="0"
+         top_delta="0"
+         name="external_controls"
+         user_resize="false"
+         width="280">
+            <web_browser
+              trusted_content="true" 
+             bottom="-5"
+             follows="left|right|top|bottom"
+             layout="topleft"
+             left="0"
+             name="browser"
+             top="0"
+             height="300"
+             width="280" />
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/en/floater_media_browser.xml b/indra/newview/skins/minimal/xui/en/floater_media_browser.xml
new file mode 100644
index 0000000000..5ea33f0a8f
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/floater_media_browser.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="440"
+ layout="topleft"
+ min_height="140"
+ min_width="467"
+ name="floater_about"
+ save_rect="true"
+ auto_tile="true"
+ title="MEDIA BROWSER"
+ width="820">
+    <floater.string
+     name="home_page_url">
+        http://www.secondlife.com
+    </floater.string>
+    <floater.string
+     name="support_page_url">
+        http://support.secondlife.com
+    </floater.string>
+    <layout_stack
+     bottom="440"
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="10"
+     name="stack1"
+     orientation="vertical" 
+     top="20"
+     width="800">
+        <layout_panel
+         auto_resize="false"
+         default_tab_group="1" 
+         height="20"
+         layout="topleft"
+         left="0"
+         name="nav_controls"
+         top="400"
+         user_resize="false"
+         width="800">
+            <button
+             follows="left|top"
+             height="20"
+             label="Back"
+             layout="topleft"
+             left="0"
+             name="back"
+             top="0"
+             width="55">
+				<button.commit_callback
+				function="MediaBrowser.Back" />
+			</button>
+            <button
+             follows="left|top"
+             height="20"
+             label="Forward"
+             layout="topleft"
+             left_pad="3"
+             name="forward"
+             top_delta="0"
+             width="68">
+				<button.commit_callback
+				function="MediaBrowser.Forward" />
+			</button>
+            <button
+             enabled="false"
+             follows="left|top"
+             height="20"
+             label="Reload"
+             layout="topleft"
+             left_pad="2"
+             name="reload"
+             top_delta="0"
+             width="70">
+				<button.commit_callback
+				function="MediaBrowser.Refresh" />
+			</button>
+            <combo_box
+             allow_text_entry="true"
+             follows="left|top|right"
+             tab_group="1"
+             height="20"
+             layout="topleft"
+             left_pad="5"
+             max_chars="1024"
+             name="address"
+             combo_editor.select_on_focus="true"
+             top_delta="0"
+             width="540">
+				<combo_box.commit_callback
+				function="MediaBrowser.EnterAddress" />
+			</combo_box>
+            <button
+             enabled="false"
+             follows="right|top"
+             height="20"
+             label="Go"
+             layout="topleft"
+             left_pad="5"
+             name="go"
+             top_delta="0"
+             width="55">
+				<button.commit_callback
+				function="MediaBrowser.Go" />
+			</button>
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         height="20"
+         layout="topleft"
+         left_delta="0"
+         name="time_controls"
+         top_delta="0"
+         user_resize="false"
+         width="800">
+            <button
+             follows="left|top"
+             height="20"
+             label="rewind"
+             layout="topleft"
+             left="0"
+             name="rewind"
+             top="0"
+             width="55" />
+            <button
+             follows="left|top"
+             height="20"
+             image_selected="button_anim_play_selected.tga"
+             image_unselected="button_anim_play.tga"
+             layout="topleft"
+             left_delta="55"
+             name="play"
+             top_delta="0"
+             width="55" />
+            <button
+             follows="left|top"
+             height="20"
+             image_selected="button_anim_pause_selected.tga"
+             image_unselected="button_anim_pause.tga"
+             layout="topleft"
+             left_delta="0"
+             name="pause"
+             top_delta="0"
+             width="55" />
+            <button
+             follows="left|top"
+             height="20"
+             label="stop"
+             layout="topleft"
+             left_pad="10"
+             name="stop"
+             top_delta="0"
+             width="55" />
+            <button
+             follows="left|top"
+             height="20"
+             label="forward"
+             layout="topleft"
+             left_pad="20"
+             name="seek"
+             top_delta="0"
+             width="55" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         height="20"
+         layout="topleft"
+         left_delta="0"
+         name="parcel_owner_controls"
+         top_delta="0"
+         user_resize="false"
+         width="540">
+            <button
+             enabled="false"
+             follows="left|top"
+             height="20"
+             label="Send Current Page to Parcel"
+             layout="topleft"
+             left="0"
+             name="assign"
+             top="0"
+             width="200">
+				<button.commit_callback
+				function="MediaBrowser.Assign" />
+			</button>
+        </layout_panel>
+        <layout_panel
+         height="40"
+         layout="topleft"
+         left_delta="0"
+         name="external_controls"
+         top_delta="0"
+         user_resize="false"
+         width="540">
+          <web_browser
+             bottom="-10"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="browser"
+             top="0"
+             width="540" />
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml b/indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml
new file mode 100644
index 0000000000..74ac885202
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ border_visible="false"
+ border="false"
+ bg_opaque_image="Window_Foreground" 
+ bg_alpha_image="Window_Background" 
+ bg_alpha_image_overlay="DkGray_66" 
+ legacy_header_height="18"
+ can_minimize="true"
+ can_tear_off="false"
+ can_resize="true"
+ can_drag_on_left="false"
+ can_close="false"
+ can_dock="true"
+ bevel_style="in"
+ height="300"
+ min_width="235"
+ layout="topleft"
+ name="nearby_chat"
+ save_rect="true"
+ title="NEARBY CHAT"
+ save_dock_state="true"
+ save_visibility="true"
+ single_instance="true"
+ width="320">
+            <check_box
+             bottom_delta="36"
+             control_name="TranslateChat"
+             enabled="true"
+             height="16"
+             label="Translate chat (powered by Google)"
+             layout="topleft"
+             left="5"
+             name="translate_chat_checkbox"
+             width="230" />
+  <chat_history
+    parse_urls="true"
+    bg_readonly_color="ChatHistoryBgColor"
+    bg_writeable_color="ChatHistoryBgColor"
+    follows="all"
+    left="5"
+    top_delta="17"
+    layout="topleft"
+    height="260"
+    name="chat_history"
+    parse_highlights="true"
+    text_color="ChatHistoryTextColor"
+    text_readonly_color="ChatHistoryTextColor"
+    right_widget_pad="5"
+    left_widget_pad="0"
+    width="315" />
+</floater>
diff --git a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
new file mode 100644
index 0000000000..efc31e5d43
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="148"
+ layout="topleft"
+ name="inspect_avatar"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="228">
+  <!-- Allowed fields include:
+	[BORN_ON] ("12/3/2008")
+	[SL_PROFILE] (Second Life profile),
+    [RW_PROFILE] (real world profile),
+	[ACCTTYPE] ("Resident"),
+	[PAYMENTINFO] ("Payment Info on File"),
+	[AGE] ("1 year 2 months")
+   -->
+  <string
+   name="Subtitle">
+[AGE]
+  </string>
+  <string
+     name="Details">
+[SL_PROFILE]
+    </string>
+  <text
+     follows="top|left"
+     font="SansSerifLarge"
+     height="16"
+     left="8"
+     name="user_name"
+     top="10"
+     text_color="White"
+     use_ellipses="true"
+     value="Grumpity ProductEngine"
+     width="175" />
+    <text
+     follows="top|left"
+     height="16"
+     left="8"
+     name="user_subtitle"
+     font="SansSerifSmall"
+     text_color="White"
+     value="11 Months, 3 days old"
+     width="175"
+     use_ellipses="true" />
+     <text
+     follows="left|top|right"
+     height="35"
+     left="8"
+     name="user_details"
+     right="-10"
+     word_wrap="true"
+     top_pad="6"
+     use_ellipses="true"
+     width="220">This is my second life description and I really think it is great.
+    </text>
+    <slider
+     follows="top|left"
+     height="23"
+     increment="0.01"
+     left="1"
+     max_val="0.95"
+     min_val="0.05"
+     name="volume_slider"
+     show_text="false"
+     tool_tip="Voice volume"
+     top_pad="0"
+     value="0.5"
+     width="195" />
+    <button
+     follows="top|left"
+     height="16"
+     image_disabled="Audio_Off"
+     image_disabled_selected="AudioMute_Off"
+     image_hover_selected="AudioMute_Over"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     left_pad="0"
+     top_delta="4"
+     name="mute_btn"
+     width="16" />
+    <avatar_icon
+     follows="top|left"
+     height="38"
+     right="-10"
+     bevel_style="in"
+     border_style="line"
+     mouse_opaque="true"
+     name="avatar_icon"
+     top="10"
+     width="38" />
+<!-- Overlapping buttons for default actions
+    llinspectavatar.cpp makes visible the most likely default action 
+-->
+  <panel 
+    follows="top|left" 
+    top="148" 
+    left="0" 
+    height="60" 
+    width="228" 
+    visible="false"
+    background_visible="true"
+    name="moderator_panel"
+    background_opaque="true" 
+    bg_opaque_color="MouseGray">
+    <button
+      name="disable_voice"
+      label="Disable Voice"
+      top="20"
+      width="95"
+      height="20"
+      left="10"
+      commit_callback.function="InspectAvatar.DisableVoice"/>
+    <button
+      name="enable_voice"
+      label="Enable Voice"
+      top="20"
+      width="95"
+      height="20"
+      left="10"
+      visible="false" 
+      commit_callback.function="InspectAvatar.EnableVoice"/>
+  </panel>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml
new file mode 100644
index 0000000000..32859690b7
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="150"
+ layout="topleft"
+ name="inspect_object"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="228">
+  <string name="Creator">By [CREATOR]</string>
+  <string name="CreatorAndOwner">
+By [CREATOR]
+Owner [OWNER]
+  </string>
+  <string name="Price">L$[AMOUNT]</string>
+  <string name="PriceFree">Free!</string>
+  <string name="Touch">Touch</string>
+  <string name="Sit">Sit</string>
+  <text
+     parse_urls="false"
+     follows="all"
+     font="SansSerifLarge"
+     height="30"
+     left="8"
+     name="object_name"
+     text_color="White"
+     top="6"
+     use_ellipses="true"
+     word_wrap="true"
+     width="220" />
+  <text
+   follows="all"
+   height="50"
+   left="8"
+   name="object_creator"
+   top_pad="6"
+   use_ellipses="true"
+   width="220">
+    by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+  </text>
+  <text
+   follows="all"
+   font="SansSerifSmall"
+   font.style="BOLD"
+   height="14"
+   halign="right"
+   right="-5"
+   name="price_text"
+   text_color="white"
+   top="60"
+   font_shadow="none"
+   width="60">
+L$30,000
+  </text>
+  <text
+   clip_partial="true"
+   follows="all"
+   font="SansSerifSmall"
+   height="25"
+   left="8"
+   name="object_description"
+   top="76"
+   use_ellipses="true"
+   width="220"
+   word_wrap="true">
+  </text>
+  <!-- Overlapping buttons for all default actions.  Show "Buy" if
+  for sale, "Sit" if can sit, etc. -->
+   <text
+   follows="all"
+   font="SansSerifSmall"
+   height="13"
+   name="object_media_url"
+   width="220"
+   top_pad="0"
+   max_length = "50"
+   use_ellipses="true">
+   http://www.superdupertest.com
+</text>
+  <button
+   follows="top|left"
+   height="20"
+   label="Touch"
+   left_delta="0"
+   name="touch_btn"
+   top_delta="0"
+   width="80" />
+  <button
+   follows="top|left"
+   height="20"
+   label="Sit"
+   left_delta="0"
+   name="sit_btn"
+   top_delta="0"
+   width="80" />
+  <icon
+   name="secure_browsing"
+   image_name="Lock"
+   left_delta="80"
+   visible="false"
+   width="18"
+   height="18"
+   top_delta="0"
+   tool_tip="Secure Browsing"
+   follows="left|top" />
+</floater>
diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
new file mode 100644
index 0000000000..88f06d9e63
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="left|right|top|bottom"
+ height="768"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ tab_stop="false" 
+ name="main_view"
+ width="1024">
+  <panel top="0"
+   follows="all"
+   height="768"
+   mouse_opaque="false"
+   name="login_panel_holder"
+   width="1024"/>
+ 
+  <layout_stack border_size="0"
+                follows="all"
+                mouse_opaque="false"
+                height="768"
+                name="menu_stack"
+                orientation="vertical"
+                top="0">
+    <layout_panel auto_resize="false"
+                  height="0"
+                  mouse_opaque="false"
+                  name="nav_bar_container"
+                  tab_stop="false"
+                  min_height="0" 
+                  width="1024"
+                  user_resize="false" 
+                  visible="true">
+    </layout_panel>
+    <layout_panel auto_resize="true"
+                  follows="all"
+                  height="500"
+                  layout="topleft"
+                  mouse_opaque="false"
+                  tab_stop="false" 
+                  name="hud"
+                  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">
+
+          <layout_stack border_size="0"
+                        bottom="500"
+                        follows="all"
+                        height="500"
+                        left="0"
+                        mouse_opaque="false"
+                        name="world_stack"
+                        open_time_constant="0.03"
+                        close_time_constant="0.03" 
+                        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="0"
+                     left="0"
+                     mouse_opaque="false"
+                     name="topinfo_bar_container"
+                     tab_stop="false"
+                     top="0"
+                     visible="false"
+                     width="1024"/>
+              <panel bottom="500"
+                     follows="left|right|bottom"
+                     height="25"
+                     left="0"
+                     mouse_opaque="false"
+                     tab_stop="false"
+                     name="stand_stop_flying_container"
+                     visible="false"
+                     width="500"/>
+              <panel follows="all"
+										 height="500"
+										 left="0"
+										 mouse_opaque="false"
+										 name="floater_view_holder"
+										 tab_group="-1"
+										 tab_stop="false"
+										 top="0"
+										 width="500">
+                <floater_view follows="all"
+															height="500"
+															left="0"
+															mouse_opaque="false"
+															name="Floater View"
+															tab_group="-1"
+															tab_stop="false"
+															top="0"
+															width="500"/>
+              </panel>
+              <panel bottom="500"
+                    follows="all"
+                    height="500"
+                    left="0"
+                    mouse_opaque="false"
+                    name="world_view_rect"
+                    width="500">
+                <icon name="sl_watermark"
+                      image_name="sl_logo.png"
+                      left="5"
+                      top="5"
+                      width="100"
+                      height="45"/>
+              </panel>
+            </layout_panel>
+            <layout_panel auto_resize="false"
+                   min_height="33"
+                   height="33" 
+                   mouse_opaque="false"
+                   name="bottom_tray_container"
+                   visible="false"/>
+            <layout_panel auto_resize="false"
+                          height="195"
+                          mouse_opaque="false"
+                          user_resize="false"
+                          name="avatar_picker_and_destination_guide_container"
+                          visible="false">
+              <panel top="0"
+                     height="195"
+                     left="0"
+                     background_visible="true" 
+                     width="500"
+                     follows="all">
+                <web_browser
+                  top="0"
+                  height="195"
+                  follows="all"
+                  name="destination_guide_contents"
+                  trusted_content="true"
+                  visible="false"
+                  start_url="http://interest.secondlife/viewer/guide"/>
+                <web_browser
+                  top="0"
+                  height="195"
+                  follows="all"
+                  name="avatar_picker_contents"
+                  visible="false"
+                  trusted_content="true"
+                  start_url="http://interest.secondlife/viewer/avatar"/>
+              </panel>
+            </layout_panel>
+          </layout_stack>
+        </layout_panel>
+      </layout_stack>
+      <debug_view follows="all"
+                  left="0"
+                  top="0"
+                  mouse_opaque="false"
+                  height="500"
+                  name="DebugView"
+                  width="1024"/>
+    </layout_panel>
+  </layout_stack>
+  <panel top="0"
+        follows="all"
+        mouse_opaque="false"
+        left="0"
+        name="snapshot_floater_view_holder" 
+        width="1024"
+        height="798">
+    <snapshot_floater_view enabled="false"
+                           follows="all"
+                           height="768"
+                           left="0"
+                           mouse_opaque="false"
+                           name="Snapshot Floater View"
+                           tab_stop="false"
+                           top="0"
+                           visible="false"
+                           width="1024"/>
+  </panel>
+  <panel top="0"
+         follows="all"
+         height="768"
+         mouse_opaque="false"
+         name="popup_holder"
+         class="popup_holder"
+         width="1024">
+  </panel>
+  <view top="0"
+        left="0"
+        width="1024"
+        height="768"
+        name="hint_holder"
+        mouse_opaque="false"
+        follows="all"/>
+  <panel top="0"
+         follows="all"
+         height="768"
+         mouse_opaque="true"
+         name="progress_view"
+         filename="panel_progress.xml"
+         class="progress_view"
+         width="1024"
+         visible="false"/>
+  <menu_holder top="0"
+               follows="all"
+               height="768"
+               mouse_opaque="false"
+               name="Menu Holder"
+               width="1024"/>
+  <tooltip_view top="0"
+                follows="all"
+                height="768"
+                mouse_opaque="false"
+                name="tooltip view"
+                tab_group="-2"
+                width="1024"/>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/minimal/xui/en/menu_add_wearable_gear.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_add_wearable_gear.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
new file mode 100644
index 0000000000..d99c7c929b
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: See also menu_avatar_other.xml -->
+<context_menu
+ layout="topleft"
+ name="Avatar Pie">
+    <menu_item_call
+     label="IM"
+     name="Send IM...">
+        <menu_item_call.on_click
+         function="Avatar.SendIM" />
+    </menu_item_call>
+    <menu_item_call
+     label="About..."
+     name="About...">
+        <on_click
+         function="Avatar.ShowInspector" />
+    </menu_item_call>
+	<menu_item_call
+	 label="Zoom In"
+	  name="Zoom In">
+	<menu_item_call.on_click
+	   function="Tools.LookAtSelection"
+	   parameter="zoom" />
+    </menu_item_call>
+  <menu_item_call
+	enabled="false"
+	label="Touch"
+	name="Object Touch">
+	<on_click function="Object.Touch" />
+	<on_enable
+		function="Object.EnableTouch"
+		name="EnableTouch"
+		parameter="Touch" />
+	</menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml b/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_avatar_icon.xml b/indra/newview/skins/minimal/xui/en/menu_avatar_icon.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_avatar_icon.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml b/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml
new file mode 100644
index 0000000000..76734440e9
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu
+ layout="topleft"
+ name="Avatar Pie">
+    <menu_item_call
+     label="IM"
+     name="Send IM...">
+        <menu_item_call.on_click
+         function="Avatar.SendIM" />
+    </menu_item_call>
+    <menu_item_call
+     label="About..."
+     name="About...">
+        <on_click
+         function="Avatar.ShowInspector" />
+    </menu_item_call>
+    <menu_item_call
+         label="Zoom In"
+          name="Zoom In">
+        <menu_item_call.on_click
+           function="Tools.LookAtSelection"
+           parameter="zoom" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/en/menu_avatar_self.xml b/indra/newview/skins/minimal/xui/en/menu_avatar_self.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_avatar_self.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_bottomtray.xml b/indra/newview/skins/minimal/xui/en/menu_bottomtray.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_bottomtray.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_cof_attachment.xml b/indra/newview/skins/minimal/xui/en/menu_cof_attachment.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_cof_attachment.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_cof_body_part.xml b/indra/newview/skins/minimal/xui/en/menu_cof_body_part.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_cof_body_part.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_cof_clothing.xml b/indra/newview/skins/minimal/xui/en/menu_cof_clothing.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_cof_clothing.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_cof_gear.xml b/indra/newview/skins/minimal/xui/en/menu_cof_gear.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_cof_gear.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_edit.xml b/indra/newview/skins/minimal/xui/en/menu_edit.xml
new file mode 100644
index 0000000000..747eb3fc6a
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_edit.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu create_jump_keys="true"
+      label="Edit"
+      name="Edit"
+      visible="false">
+  <menu_item_call
+   label="Undo"
+   name="Undo"
+   shortcut="control|Z">
+    <menu_item_call.on_click
+     function="Edit.Undo" />
+    <menu_item_call.on_enable
+     function="Edit.EnableUndo" />
+  </menu_item_call>
+  <menu_item_call
+   label="Redo"
+   name="Redo"
+   shortcut="control|Y">
+    <menu_item_call.on_click
+     function="Edit.Redo" />
+    <menu_item_call.on_enable
+     function="Edit.EnableRedo" />
+  </menu_item_call>
+  <menu_item_separator/>
+  <menu_item_call
+   label="Cut"
+   name="Cut"
+   shortcut="control|X">
+    <menu_item_call.on_click
+     function="Edit.Cut" />
+    <menu_item_call.on_enable
+     function="Edit.EnableCut" />
+  </menu_item_call>
+  <menu_item_call
+   label="Copy"
+   name="Copy"
+   shortcut="control|C">
+    <menu_item_call.on_click
+     function="Edit.Copy" />
+    <menu_item_call.on_enable
+     function="Edit.EnableCopy" />
+  </menu_item_call>
+  <menu_item_call
+   label="Paste"
+   name="Paste"
+   shortcut="control|V">
+    <menu_item_call.on_click
+     function="Edit.Paste" />
+    <menu_item_call.on_enable
+     function="Edit.EnablePaste" />
+  </menu_item_call>
+  <menu_item_call
+   label="Delete"
+   name="Delete"
+   allow_key_repeat="true" 
+   shortcut="Del">
+    <menu_item_call.on_click
+     function="Edit.Delete" />
+    <menu_item_call.on_enable
+     function="Edit.EnableDelete" />
+  </menu_item_call>
+  <menu_item_call
+   label="Duplicate"
+   name="Duplicate"
+   shortcut="control|D">
+    <menu_item_call.on_click
+     function="Edit.Duplicate" />
+    <menu_item_call.on_enable
+     function="Edit.EnableDuplicate" />
+  </menu_item_call>
+  <menu_item_separator/>
+  <menu_item_call
+   label="Select All"
+   name="Select All"
+   shortcut="control|A">
+    <menu_item_call.on_click
+     function="Edit.SelectAll" />
+    <menu_item_call.on_enable
+     function="Edit.EnableSelectAll" />
+  </menu_item_call>
+  <menu_item_call
+   label="Deselect"
+   name="Deselect"
+   shortcut="control|E">
+    <menu_item_call.on_click
+     function="Edit.Deselect" />
+    <menu_item_call.on_enable
+     function="Edit.EnableDeselect" />
+  </menu_item_call>
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/minimal/xui/en/menu_favorites.xml b/indra/newview/skins/minimal/xui/en/menu_favorites.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_favorites.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_gesture_gear.xml b/indra/newview/skins/minimal/xui/en/menu_gesture_gear.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_gesture_gear.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_group_plus.xml b/indra/newview/skins/minimal/xui/en/menu_group_plus.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_group_plus.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_hide_navbar.xml b/indra/newview/skins/minimal/xui/en/menu_hide_navbar.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_hide_navbar.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_im_well_button.xml b/indra/newview/skins/minimal/xui/en/menu_im_well_button.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_im_well_button.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/minimal/xui/en/menu_imchiclet_adhoc.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_imchiclet_adhoc.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/minimal/xui/en/menu_imchiclet_group.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_imchiclet_group.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/minimal/xui/en/menu_imchiclet_p2p.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_imchiclet_p2p.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_inv_offer_chiclet.xml b/indra/newview/skins/minimal/xui/en/menu_inv_offer_chiclet.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_inv_offer_chiclet.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_inventory.xml b/indra/newview/skins/minimal/xui/en/menu_inventory.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_inventory_add.xml b/indra/newview/skins/minimal/xui/en/menu_inventory_add.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_inventory_add.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/minimal/xui/en/menu_inventory_gear_default.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_inventory_gear_default.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_land.xml b/indra/newview/skins/minimal/xui/en/menu_land.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_land.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_landmark.xml b/indra/newview/skins/minimal/xui/en/menu_landmark.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_landmark.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_login.xml b/indra/newview/skins/minimal/xui/en/menu_login.xml
new file mode 100644
index 0000000000..62dbce3f56
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_login.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_mini_map.xml b/indra/newview/skins/minimal/xui/en/menu_mini_map.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_mini_map.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_navbar.xml b/indra/newview/skins/minimal/xui/en/menu_navbar.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_navbar.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_nearby_chat.xml b/indra/newview/skins/minimal/xui/en/menu_nearby_chat.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_nearby_chat.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_notification_well_button.xml b/indra/newview/skins/minimal/xui/en/menu_notification_well_button.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_notification_well_button.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_object.xml b/indra/newview/skins/minimal/xui/en/menu_object.xml
new file mode 100644
index 0000000000..888ce42cf1
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_object.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Object Pie">
+   <menu_item_call
+     enabled="false"
+     label="Sit Here"
+     name="Object Sit">
+        <menu_item_call.on_click
+         function="Object.SitOrStand" />
+        <menu_item_call.on_enable
+         function="Object.EnableSit" />
+   </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Stand Up"
+     name="Object Stand Up">
+        <menu_item_call.on_click
+         function="Object.SitOrStand" />
+        <menu_item_call.on_enable
+         function="Object.EnableStandUp" />
+   </menu_item_call>
+  <menu_item_call
+       label="Zoom In"
+       name="Zoom In">
+    <menu_item_call.on_click
+     function="Object.ZoomIn" />
+  </menu_item_call>
+  <menu_item_call
+    enabled="false"
+    label="Touch"
+    name="Object Touch">
+    <menu_item_call.on_click
+     function="Object.Touch" />
+    <menu_item_call.on_enable
+     function="Object.EnableTouch"
+     name="EnableTouch"
+     parameter="Touch" />
+  </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/minimal/xui/en/menu_object_icon.xml b/indra/newview/skins/minimal/xui/en/menu_object_icon.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_object_icon.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_outfit_gear.xml b/indra/newview/skins/minimal/xui/en/menu_outfit_gear.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_outfit_gear.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_outfit_tab.xml b/indra/newview/skins/minimal/xui/en/menu_outfit_tab.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_outfit_tab.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_participant_list.xml b/indra/newview/skins/minimal/xui/en/menu_participant_list.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_participant_list.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/minimal/xui/en/menu_people_friends_view_sort.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_people_friends_view_sort.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_people_groups.xml b/indra/newview/skins/minimal/xui/en/menu_people_groups.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_people_groups.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/minimal/xui/en/menu_people_groups_view_sort.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_people_groups_view_sort.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml b/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/minimal/xui/en/menu_people_nearby_multiselect.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_people_nearby_multiselect.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/minimal/xui/en/menu_people_nearby_view_sort.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_people_nearby_view_sort.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/minimal/xui/en/menu_people_recent_view_sort.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_people_recent_view_sort.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_picks.xml b/indra/newview/skins/minimal/xui/en/menu_picks.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_picks.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_picks_plus.xml b/indra/newview/skins/minimal/xui/en/menu_picks_plus.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_picks_plus.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_place.xml b/indra/newview/skins/minimal/xui/en/menu_place.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_place.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_place_add_button.xml b/indra/newview/skins/minimal/xui/en/menu_place_add_button.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_place_add_button.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/minimal/xui/en/menu_places_gear_folder.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_places_gear_folder.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/minimal/xui/en/menu_places_gear_landmark.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_places_gear_landmark.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_profile_overflow.xml b/indra/newview/skins/minimal/xui/en/menu_profile_overflow.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_profile_overflow.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_save_outfit.xml b/indra/newview/skins/minimal/xui/en/menu_save_outfit.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_save_outfit.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_script_chiclet.xml b/indra/newview/skins/minimal/xui/en/menu_script_chiclet.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_script_chiclet.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_slurl.xml b/indra/newview/skins/minimal/xui/en/menu_slurl.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_slurl.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/minimal/xui/en/menu_teleport_history_gear.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_teleport_history_gear.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/minimal/xui/en/menu_teleport_history_item.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_teleport_history_item.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_teleport_history_tab.xml b/indra/newview/skins/minimal/xui/en/menu_teleport_history_tab.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_teleport_history_tab.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_text_editor.xml b/indra/newview/skins/minimal/xui/en/menu_text_editor.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_text_editor.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_topinfobar.xml b/indra/newview/skins/minimal/xui/en/menu_topinfobar.xml
new file mode 100644
index 0000000000..9ebab9ef98
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_topinfobar.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_agent.xml b/indra/newview/skins/minimal/xui/en/menu_url_agent.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_agent.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_group.xml b/indra/newview/skins/minimal/xui/en/menu_url_group.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_group.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_http.xml b/indra/newview/skins/minimal/xui/en/menu_url_http.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_http.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_inventory.xml b/indra/newview/skins/minimal/xui/en/menu_url_inventory.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_map.xml b/indra/newview/skins/minimal/xui/en/menu_url_map.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_map.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_objectim.xml b/indra/newview/skins/minimal/xui/en/menu_url_objectim.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_objectim.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_parcel.xml b/indra/newview/skins/minimal/xui/en/menu_url_parcel.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_parcel.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_slapp.xml b/indra/newview/skins/minimal/xui/en/menu_url_slapp.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_slapp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_slurl.xml b/indra/newview/skins/minimal/xui/en/menu_url_slurl.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_slurl.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_url_teleport.xml b/indra/newview/skins/minimal/xui/en/menu_url_teleport.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_url_teleport.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_viewer.xml b/indra/newview/skins/minimal/xui/en/menu_viewer.xml
new file mode 100644
index 0000000000..cd83ea4e99
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_viewer.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar
+ bg_visible="false"
+ follows="left|top|right"
+ name="Main Menu">
+    <menu
+     create_jump_keys="true"
+     label="Help"
+     name="Help"
+     tear_off="true">
+        <menu_item_call
+         label="[SECOND_LIFE] Help"
+         name="Second Life Help"
+         shortcut="F1">
+            <menu_item_call.on_click
+             function="ShowHelp"
+             parameter="f1_help" />
+        </menu_item_call>
+    </menu>
+    <menu
+     create_jump_keys="true"
+     label="Advanced"
+     name="Advanced"
+     tear_off="true"
+     visible="false">
+        <menu
+         create_jump_keys="true"
+         label="Shortcuts"
+         name="Shortcuts"
+         tear_off="true"
+         visible="false">
+            <menu_item_check
+             label="Fly"
+             name="Fly"
+             shortcut="Home">
+                <menu_item_check.on_check
+                 function="Agent.getFlying" />
+                <menu_item_check.on_click
+                 function="Agent.toggleFlying" />
+                <menu_item_check.on_enable
+                 function="Agent.enableFlying" />
+            </menu_item_check>
+            <menu_item_call
+             label="Close Window"
+             name="Close Window"
+             shortcut="control|W">
+                <menu_item_call.on_click
+                 function="File.CloseWindow" />
+                <menu_item_call.on_enable
+                 function="File.EnableCloseWindow" />
+            </menu_item_call>
+            <menu_item_call
+             label="Close All Windows"
+             name="Close All Windows"
+             shortcut="control|shift|W">
+                <menu_item_call.on_click
+                 function="File.CloseAllWindows" />
+                <menu_item_call.on_enable
+                 function="File.EnableCloseAllWindows" />
+            </menu_item_call>
+
+            <menu_item_call
+             label="Reset View"
+             name="Reset View"
+             shortcut="Esc">
+                <menu_item_call.on_click
+                 function="View.ResetView" />
+            </menu_item_call>
+        </menu> <!--Shortcuts-->
+    </menu>
+</menu_bar>
diff --git a/indra/newview/skins/minimal/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/minimal/xui/en/menu_wearable_list_item.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_wearable_list_item.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_wearing_gear.xml b/indra/newview/skins/minimal/xui/en/menu_wearing_gear.xml
new file mode 100644
index 0000000000..28c4762eaa
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_wearing_gear.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/menu_wearing_tab.xml b/indra/newview/skins/minimal/xui/en/menu_wearing_tab.xml
new file mode 100644
index 0000000000..fb19c5eb2c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/menu_wearing_tab.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu/>
diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
new file mode 100644
index 0000000000..9740474d37
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<notification_visibility>
+  <respond name="UserGiveItem" response="Discard"/>
+  <respond name="JoinGroup" response="Decline"/>
+  <respond name="VoiceInviteP2P" response="Decline"/>
+  <respond name="VoiceInviteAdHoc" response="Decline"/>
+  <respond name="OfferFriendship" response="Decline"/>
+  <respond name="OfferFriendshipNoMessage" response="Decline"/>
+  <respond name="TeleportOffered" response="Cancel"/>
+  <respond name="ObjectGiveItem" response="Discard"/>
+  <respond name="VoiceInviteGroup" response="Decline"/>
+  <respond name="ConfirmQuit" response="OK_okcancelignore"/>
+  <respond name="YouHaveBeenLoggedOut" response="Cancel_okcancelbuttons"/>
+  <hide name="HintInventory"/>
+  <hide name="HintLindenDollar"/>
+  <hide name="HintMove"/>
+  <hide name="ClothingLoading"/>
+  <hide name="NotAgeVerified"/>
+  <hide name="RegionEntryAccessBlocked_Change"/>
+  <hide name="LandBuyPass"/>
+  <hide name="LoginPacketNeverReceived"/>
+  <hide name="RegionEntryAccessBlocked_KB"/>
+  <hide name="RegionTPAccessBlocked"/>
+  <hide name="RegionEntryAccessBlocked"/>
+  <show name="RegionRestartMinutes"/>
+  <show name="RegionRestartSeconds"/>
+  <show tag="fail"/>
+  <show type="hint"/>
+  <show type="notifytoast"/>
+  <hide/>
+</notification_visibility>
+
diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
new file mode 100644
index 0000000000..6c33a8f930
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ 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"
+ focus_root="true" 
+ 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="214"
+         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="306"
+            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="65"
+         mouse_opaque="false"
+         name="gesture_panel"
+         top_delta="0"
+         user_resize="false"
+         width="85">
+            <gesture_combo_list
+             follows="left|right"
+             height="23"
+             label="Gesture"
+             layout="topleft"
+             get_more="false"
+             view_all="false" 
+             left="0"
+             name="Gesture"
+             tool_tip="Shows/hides gestures"
+             top="5"
+             width="82">
+                <combo_button
+                 pad_right="10"
+                 can_drag="false" 
+                 use_ellipses="true" />
+                <combo_list
+                 page_lines="17" />
+            </gesture_combo_list>
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="52"
+         mouse_opaque="false"
+         name="cam_panel"
+         user_resize="false"
+         width="83">
+            <bottomtray_button
+              can_drag="false" 
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="true"
+             label="View"
+             layout="topleft"
+             left="0"
+             name="camera_btn"
+             tool_tip="Shows/hides camera controls"
+             top="5"
+             use_ellipses="true"
+             width="80">
+                <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="17"
+         name="splitter_panel"
+         user_resize="false"
+         width="17">
+            <icon
+             follows="left|bottom"
+             height="18"
+             width="2" 
+             left="6" 
+             image_name="Button_Separator" 
+             name="separator" 
+             top="7"/>
+        </layout_panel>
+      <layout_panel
+        auto_resize="false"
+        follows="left|right"
+        height="28"
+        layout="topleft"
+        min_height="28"
+        min_width="206"
+        mouse_opaque="false"
+        name="avatar_and_destinations_panel"
+        user_resize="false"
+        width="206">
+        <radio_group name="avatar_and_destination_btns"
+                     commit_callback.function="DestinationAndAvatar.show" 
+                     allow_deselect="true"
+                     top="5"
+                     left="0"
+                     height="23" 
+                     width="206">
+          <radio_item left="0" 
+                      height="23"
+                      bottom="0"
+                      width="100"
+                      name="destination_btn"
+                      value="0">
+            <check_button  image_pressed="PushButton_Press"
+                           image_pressed_selected="PushButton_Selected_Press"
+                           image_selected="PushButton_Selected_Press"
+                           image_unselected="PushButton_Off"
+                           scale_image="true"
+                           font="SansSerifSmall"
+                           label="Destinations"
+                           left="0"
+                           height="23"
+                           width="100"
+                           bottom="0"/>
+          </radio_item>
+          <radio_item left="105"
+                      height="23"
+                      bottom="0"
+                      width="100"
+                      name="avatar_btn"
+                      value="1">
+            <check_button  image_pressed="PushButton_Press"
+                           image_pressed_selected="PushButton_Selected_Press"
+                           image_selected="PushButton_Selected_Press"
+                           image_unselected="PushButton_Off"
+                           scale_image="true"
+                           font="SansSerifSmall"
+                           label="Avatars"
+                           left="0"
+                           height="23"
+                           width="100"
+                           bottom="0"/>
+          </radio_item>
+        </radio_group>
+       </layout_panel>
+       <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_width="17"
+         name="splitter_panel"
+         user_resize="false"
+         width="17">
+            <icon
+             follows="left|bottom"
+             height="18"
+             width="2" 
+             left="6" 
+             image_name="Button_Separator" 
+             name="separator" 
+             top="7"/>
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="65"
+         mouse_opaque="false"
+         name="help_panel"
+         top_delta="0"
+         user_resize="false"
+         width="85">
+          <bottomtray_button
+             can_drag="false"
+            follows="left|right"
+            height="23"
+            image_pressed="PushButton_Press"
+            image_pressed_selected="PushButton_Selected_Press"
+            image_selected="PushButton_Selected_Press"
+            label="How To"
+            layout="topleft"
+            left="0"
+            name="help_btn"
+            tool_tip="Shows help window"
+            top="5"
+            use_ellipses="true"
+            width="80">
+            <bottomtray_button.commit_callback
+              function="ShowHelp"
+             parameter="f1_help" />
+          </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="99"
+             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="99"
+             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>
diff --git a/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
new file mode 100644
index 0000000000..53def54aca
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="false"
+ height="300"
+ name="panel_im_control_panel"
+ width="150">
+    <avatar_icon
+     follows="left|top"
+     height="105"
+     left_delta="20"
+     name="avatar_icon"
+     top="-5"
+     width="114"/>
+    <layout_stack
+     mouse_opaque="false"
+     border_size="0"
+     clip="false"
+     follows="all"
+     height="183"
+     layout="topleft"
+     left="5"
+     name="button_stack"
+     orientation="vertical"
+     top_pad="5"
+     width="145">
+    </layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_login.xml b/indra/newview/skins/minimal/xui/en/panel_login.xml
new file mode 100644
index 0000000000..74f985b9ec
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_login.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+follows="all"
+height="600"
+layout="topleft"
+left="0"
+name="panel_login"
+top="600"
+focus_root="true" 
+ width="996">
+<panel.string
+     name="create_account_url">
+       http://join.secondlife.com/
+</panel.string>
+<panel.string
+     name="real_url" translate="false">
+       http://secondlife.com/app/login/
+</panel.string>
+    <string name="reg_in_client_url" translate="false">
+     http://secondlife.eniac15.lindenlab.com/reg-in-client/
+</string>
+<panel.string
+     name="forgot_password_url">
+       http://secondlife.com/account/request.php
+</panel.string>
+<!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
+<web_browser
+  tab_stop="false" 
+trusted_content="true" 
+bg_opaque_color="Black"
+border_visible="false"
+bottom="600"
+follows="all"
+hide_loading="true"
+left="0"
+name="login_html_"
+start_url="http://upload.wikimedia.org/wikipedia/commons/3/37/Daylighting_-_Skylight.jpg"
+height="695"
+  width="996" />
+<layout_stack
+follows="left|bottom|right"
+name="login_widgets"
+layout="topleft"
+orientation="horizontal"
+top="519"
+width="996"
+height="80">
+<layout_panel
+auto_resize="false"
+follows="left|bottom"
+name="login"
+layout="topleft"
+width="695"
+min_width="695"
+user_resize="false"
+height="80">
+<text
+follows="left|bottom"
+font="SansSerifSmall"
+height="16"
+name="username_text"
+top="20"
+left="20"
+width="150">
+Username:
+</text>
+  <combo_box
+  allow_text_entry="true"
+  follows="left|bottom"
+  height="22"
+  left_delta="0"
+  max_chars="128"
+  prevalidate_callback="ascii"
+  select_on_focus="true"
+  tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
+  top_pad="0"
+  name="username_combo"
+  width="178">
+    <combo_box.combo_button
+     visible ="false"/>
+    <combo_box.drop_down_button
+     visible ="false"/>
+  </combo_box>
+<text
+follows="left|bottom"
+font="SansSerifSmall"
+height="15"
+left_pad="8"
+name="password_text"
+top="20"
+    width="150">
+       Password:
+</text>
+<line_editor
+follows="left|bottom"
+  height="22"
+  max_length_bytes="16"
+name="password_edit"
+is_password="true"
+select_on_focus="true"
+  top_pad="0"
+  width="135" />
+ <check_box
+control_name="RememberPassword"
+follows="left|bottom"
+font="SansSerifSmall"
+height="16"
+label="Remember password"
+  top_pad="3"
+  name="remember_check"
+ width="135" />
+<button
+  follows="left|bottom"
+  height="23"
+  image_unselected="PushButton_On"
+  image_selected="PushButton_On_Selected"
+  label="Log In"
+  label_color="White"
+  layout="topleft"
+  left_pad="10"
+  name="connect_btn"
+  top="35"
+  width="90" />
+  <text
+  follows="left|bottom"
+  font="SansSerifSmall"
+  height="15"
+  left_pad="18"
+  name="start_location_text"
+top="20"
+  width="130">
+       Start at:
+ </text>
+<combo_box
+allow_text_entry="true"
+control_name="LoginLocation"
+  follows="left|bottom"
+  height="23"
+max_chars="128"
+top_pad="0"
+name="start_location_combo"
+     width="170">
+<combo_box.item
+label="My last location"
+name="MyLastLocation"
+         value="last" />
+<combo_box.item
+label="My home"
+name="MyHome"
+         value="home" />
+<combo_box.item
+label="&lt;Type region name&gt;"
+name="Typeregionname"   value="" />
+</combo_box>
+<combo_box
+allow_text_entry="true"
+font="SansSerifSmall"
+   follows="left|right|bottom"
+   height="23"
+   max_chars="256"
+layout="topleft"
+top_pad="2"
+name="server_combo"
+width="135"
+  visible="false" />
+</layout_panel>
+<layout_panel
+tab_stop="false"
+follows="right|bottom"
+name="links"
+width="200"
+min_width="200"
+user_resize="false"
+height="80">
+<text
+    follows="right|bottom"
+    font="SansSerifLarge"
+    halign="right"
+    height="28"
+    top_pad="12"
+    name="channel_text"
+    width="180"
+    word_wrap="true">
+       Skylight FTW!
+   </text>
+   </layout_panel>
+</layout_stack>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
new file mode 100644
index 0000000000..729321675b
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_color="MouseGray"
+ follows="left|top|right"
+ height="26"
+ layout="topleft"
+ name="navigation_bar"
+ chrome="true"
+ width="600">
+	<icon
+	 follows="all"
+	 image_name="NavBar_BG"
+	 mouse_opaque="false"
+	 name="bg_icon"
+	 scale_image="true"
+	 visible="true"
+	 left="0"
+	 top="0"
+	 height="26"
+	 width="600"/>
+	<icon
+	 follows="all"
+	 image_name="NavBar_BG_NoFav_Bevel"
+	 mouse_opaque="false"
+	 name="bg_icon_no_fav_bevel"
+	 scale_image="true"
+	 visible="false"
+	 left="0"
+	 top="0"
+	 height="26"
+	 width="600"/>
+	<icon
+	 follows="all"
+	 image_name="NavBar_BG_NoNav_Bevel"
+	 mouse_opaque="false"
+	 name="bg_icon_no_nav_bevel"
+	 scale_image="true"
+	 visible="false"
+	 left="0"
+	 top="0"
+	 height="26"
+	 width="600"/>
+	<panel
+	 background_visible="false"
+	 follows="left|top|right"
+	 top="3"
+	 height="26"
+	 layout="topleft"
+	 name="navigation_panel"
+	 width="600">
+	    <location_input
+	     follows="left|right|top"
+	     halign="right"
+	     height="23"
+	     label="Location"
+	     layout="topleft"
+	     left="7"
+	     max_chars="254"
+	     mouse_opaque="false"
+	     name="location_combo"
+       enabled="false"
+	     top="0"
+	     width="550">
+        <combo_editor
+          text_color="White"
+          background_image=""/>
+        <maturity_button
+          width="0"
+          height="0"/>
+        <info_button
+          width="0"
+          image_unselected=""
+          image_disabled="" 
+          visible="false"/>
+        <add_landmark_button
+          visible="false"/>
+        <combo_button
+          width="0"
+          image_unselected=""
+          visible="false"/>
+        <combo_list
+         mouse_wheel_opaque="true"/>
+	    </location_input>
+      <button
+        right="-5" 
+        top="2"
+        width="16"
+        height="16" 
+        follows="top|right" 
+        name="skylight_help"
+        image_unselected="Icon_Help_Foreground"
+        image_selected="Icon_Help_Press"
+        />
+	</panel>
+</panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml
new file mode 100644
index 0000000000..dfc8f55b03
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml
@@ -0,0 +1,581 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	follows="left|right|top|bottom"
+	name="MediaControls"
+	background_visible="false"
+	height="200"
+	layout="topleft"
+	help_topic="prim_media_controls"
+	mouse_opaque="false"
+	min_width="300"
+	width="800">
+  <string name="control_background_image_name">Inspector_Background</string>
+  <string name="skip_step">0.2</string>
+  <string name="min_width">300</string>
+  <string name="min_height">75</string>
+  <string name="zoom_near_padding">1.0</string>
+  <string name="zoom_medium_padding">1.1</string>
+  <string name="zoom_far_padding">1.5</string>
+  <string name="top_world_view_avoid_zone">50</string>
+  <layout_stack
+	  name="progress_indicator_area"
+	  follows="left|right|top"
+	  height="8"
+	  layout="topleft"
+	  animate="false"
+	  left="0"
+	  orientation="horizontal"
+	  top="22">
+	<!-- outer layout_panels center the inner one -->
+	<layout_panel
+		width="0"
+		name="left_bookend_bottom"
+		mouse_opaque="false"
+		layout="topleft"
+		user_resize="false" />
+	<layout_panel
+		name="media_progress_indicator"
+		mouse_opaque="false"
+		height="8"
+		layout="topleft"
+		left="0"
+		top="0"
+		auto_resize="false"
+		user_resize="false"
+		min_width="100"
+		width="200">
+	  <progress_bar
+		  name="media_progress_bar"
+		  color_bg="1 1 1 1"
+		  color_bar="1 1 1 0.96"
+		  follows="left|right|top"
+		  height="8"
+		  layout="topleft"
+		  top="0"
+		  left="0"
+		  tool_tip="Media is Loading"/>
+	</layout_panel>
+	<layout_panel
+		name="right_bookend_bottom"
+		width="0"
+		mouse_opaque="false"
+		layout="topleft"
+		user_resize="false" />
+  </layout_stack>
+  <layout_stack
+	  name="media_controls"
+	  follows="left|right|top"
+	  animate="false"
+	  height="75"
+	  layout="topleft"
+	  top="0"
+	  left="0"
+	  border_size="0"
+	  mouse_opaque="false"
+	  orientation="horizontal">
+	<!-- outer layout_panels center the inner one -->
+	<layout_panel
+		name="left_bookend"
+		top="0"
+		width="0"
+		mouse_opaque="false"
+		layout="topleft"
+		user_resize="false" />
+	<layout_panel
+		name="back"
+		top="0"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		mouse_opaque="false"
+		min_width="22"
+		width="22">
+	  <button
+		  name="back_btn"
+		  follows="top"
+		  image_overlay="Arrow_Left_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  auto_resize="false"
+		  layout="topleft"
+		  tool_tip="Navigate back"
+		  top="0"
+		  left="0"
+		  width="22"
+		  height="22">
+		<button.commit_callback
+			function="MediaCtrl.Back" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="fwd"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		min_width="22"
+		top="0"
+		height="22"
+		width="22">
+	  <button
+		  name="fwd_btn"
+		  follows="top"
+		  image_overlay="Arrow_Right_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  top="0"
+		  height="22"
+		  width="22"
+		  layout="topleft"
+		  tool_tip="Navigate forward">
+		<button.commit_callback
+			function="MediaCtrl.Forward" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="home"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+	  <button
+		  name="home_btn"
+		  follows="top"
+		  image_overlay="Home_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  layout="topleft"
+		  tool_tip="Home page"
+		  top="0"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Home" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="media_stop"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+	  <button
+		  name="media_stop_btn"
+		  follows="top"
+		  image_overlay="Stop_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  layout="topleft"
+		  tool_tip="Stop media"
+		  top="0"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.MediaStop" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="reload"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+	  <button
+		  name="reload_btn"
+		  follows="top"
+		  image_overlay="Refresh_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  layout="topleft"
+		  tool_tip="Reload"
+		  top="0"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Reload" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="stop"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+	  <button
+		  name="stop_btn"
+		  follows="top"
+		  image_overlay="StopReload_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  layout="topleft"
+		  tool_tip = "Stop loading"
+		  top="0"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Stop" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="play"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		height="22"
+		min_width="22"
+		width="22">
+	  <button
+		  name="play_btn"
+		  follows="top"
+		  image_overlay="Play_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  layout="topleft"
+		  tool_tip = "Play media"
+		  top="0"
+		  height="22"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Play" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="pause"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		min_width="22"
+		width="22">
+	  <button
+		  name="pause_btn"
+		  follows="top"
+		  image_overlay="Pause_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  layout="topleft"
+		  top="0"
+		  height="22"
+		  width="22"
+		  tool_tip = "Pause media">
+		<button.commit_callback
+			function="MediaCtrl.Pause" />
+	  </button>
+	</layout_panel>
+	<!-- media URL entry  -->
+	<layout_panel
+		name="media_address"
+		mouse_opaque="false"
+		auto_resize="true"
+		user_resize="false"
+		height="24"
+		follows="left|right|bottom"
+		layout="topleft"
+		top="0"
+		width="190"
+		min_width="90">
+	  <text 
+		  name="media_address_url"
+		  follows="top|left|right" 
+		  height="22"
+		  top="5"
+      valign="bottom" 
+		  tool_tip="Media URL"
+		  text_pad_right="16"> 
+      http://www.secondlife.com
+	  </text>
+	  <layout_stack
+		  name="media_address_url_icons"
+		  animate="false"
+		  follows="top|right"
+		  height="20"
+		  width="38"
+		  top="0"
+		  right="-1"
+		  border_size="0"
+		  mouse_opaque="false"
+		  orientation="horizontal">
+		<layout_panel
+			layout="topleft"
+			width="16"
+			mouse_opaque="false"
+			auto_resize="false"
+			user_resize="false">
+		  <icon
+			  name="media_whitelist_flag"
+			  follows="top|right"
+			  height="16"
+			  image_name="Flag"
+			  layout="topleft"
+			  tool_tip="White List enabled"
+			  width="16" />
+		</layout_panel>
+		<layout_panel
+			layout="topleft"
+			width="16"
+			mouse_opaque="false"
+			auto_resize="false"
+			user_resize="false">
+		  <icon
+			  name="media_secure_lock_flag"
+			  height="16"
+			  image_name="Lock2"
+			  layout="topleft"
+			  tool_tip="Secured Browsing"
+			  width="16" />
+		</layout_panel>
+	  </layout_stack>
+	</layout_panel>
+	<layout_panel
+		name="media_play_position"
+		mouse_opaque="false"
+		auto_resize="true"
+		user_resize="false"
+		follows="left|right"
+		layout="topleft"
+		top="0"
+		height="22"
+		min_width="100"
+		width="200">
+	  <slider_bar
+		  name="media_play_slider"
+		  follows="left|right|top"
+		  top="0"
+		  height="22"
+		  increment="0.01"
+		  initial_value="0.5"
+		  layout="topleft"
+		  tool_tip="Movie play progress"
+		  width="200">
+		<slider_bar.commit_callback
+			function="MediaCtrl.JumpProgress" />
+	  </slider_bar>
+	</layout_panel>
+	<layout_panel
+		name="skip_back"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		min_width="22"
+		width="22">
+	  <button
+		  name="skip_back_btn"
+		  follows="top"
+		  image_overlay="SkipBackward_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  auto_resize="false"
+		  height="22"
+		  layout="topleft"
+		  tool_tip="Step back"
+		  top="0"
+		  width="22"
+		  left="0">
+		<button.commit_callback
+			function="MediaCtrl.SkipBack" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="skip_forward"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		min_width="22"
+		width="22">
+	  <button
+		  name="skip_forward_btn"
+		  follows="top"
+		  image_overlay="SkipForward_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  height="22"
+		  layout="topleft"
+		  tool_tip="Step forward"
+		  top="0"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.SkipForward" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="media_volume"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		height="72"
+		min_width="22"
+		width="22">
+	  <!-- Note: this is not quite right either...the mute button is not the -->
+	  <!-- same as the others because it cannot have the "image_overlay" be  -->
+	  <!-- two different images.  -->
+	  <!-- Note also: the button and the slider must overlap! -->
+	  <button
+		  name="media_mute_button"
+		  follows="top"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="AudioMute_Off"
+		  image_unselected="Audio_Off"
+		  hover_glow_amount="0.15"
+		  is_toggle="true"
+		  layout="topleft"
+		  scale_image="false" 
+		  tool_tip="Mute This Media"
+		  top="0"
+		  height="20"
+		  width="22" >
+		<button.commit_callback
+			function="MediaCtrl.ToggleMute" />
+		<button.mouseenter_callback
+			function="MediaCtrl.ShowVolumeSlider" />
+		<button.mouseleave_callback
+			function="MediaCtrl.HideVolumeSlider" />
+	  </button>
+	  <slider
+		  orientation="vertical"
+		  left="0"
+		  top="16"
+		  height="50"
+		  layout="topleft"
+		  increment="0.01"
+		  initial_value="0.5"
+		  name="volume_slider"
+		  tool_tip="Media Volume"
+		  show_text="false"
+		  volume="true">
+		<slider.commit_callback
+			function="MediaCtrl.Volume"/>
+		<slider.mouseenter_callback
+			function="MediaCtrl.ShowVolumeSlider" />
+		<slider.mouseleave_callback
+			function="MediaCtrl.HideVolumeSlider" />
+	  </slider>
+	</layout_panel>
+	<layout_panel
+		name="zoom_frame"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		height="28"
+		min_width="22"
+		width="22">
+	  <button
+		  name="zoom_frame_btn"
+		  follows="top"
+		  image_overlay="Zoom_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  top="0"
+		  height="22"
+		  layout="topleft"
+		  tool_tip="Zoom into media"
+		  width="22">
+		<button.commit_callback
+			function="MediaCtrl.Zoom" />
+	  </button>
+	</layout_panel>
+	<layout_panel
+		name="close"
+		mouse_opaque="false"
+		auto_resize="false"
+		user_resize="false"
+		layout="topleft"
+		top="0"
+		min_width="21"
+		width="21" >
+	  <button
+		  name="close_btn"
+		  follows="top"
+		  image_overlay="UnZoom_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  top="0"
+		  height="22"
+		  layout="topleft"
+		  tool_tip ="Zoom Back"
+		  top_delta="-4"
+		  width="21" >
+		<button.commit_callback
+			function="MediaCtrl.Close" />
+	  </button>
+	</layout_panel>
+	<!-- bookend panel -->
+	<layout_panel
+		name="right_bookend"
+		mouse_opaque="false"
+		top="0"
+		width="0"
+		layout="topleft"
+		user_resize="false" />
+  </layout_stack>
+  <panel
+	  name="media_region"
+	  height="100"
+	  follows="left|right|top|bottom"
+	  layout="topleft"
+	  mouse_opaque="false"
+	  top="30" />
+</panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_progress.xml b/indra/newview/skins/minimal/xui/en/panel_progress.xml
new file mode 100644
index 0000000000..03e4ee5aed
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_progress.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="left|bottom|right|top"
+ height="768"
+ layout="topleft"
+ left="0"
+ name="login_progress_panel"
+ background_visible="true"
+ background_opaque="true"
+ bg_opaque_image="login_teleport_background.jpg"
+ top="768"
+ width="1024">
+  <progress_bar
+   bottom="35"
+   color_bar="1 1 1 0.96"
+   height="16"
+   left="220"
+   name="login_progress_bar"
+   follows="left|right|bottom"
+   right="-220" />
+</panel>
-- 
cgit v1.2.3


From 9ef646a8de73ad4fa3d59bea3f3cef66aad073d1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 23 Feb 2011 16:40:38 -0800
Subject: SOCIAL-547 WIP Add skin selection dropdown to login screen enable
 confirmation dialog in basic skin

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 9740474d37..4a808b19b7 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -27,6 +27,7 @@
   <show tag="fail"/>
   <show type="hint"/>
   <show type="notifytoast"/>
+  <show name="ModeChange"/>
   <hide/>
 </notification_visibility>
 
-- 
cgit v1.2.3


From 7a69d736b5e9e725cda9e9892b37d112883fd835 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 23 Feb 2011 16:41:03 -0800
Subject: SOCIAL-547 WIP Add skin selection dropdown to login screen add skin
 chooser to login screen

---
 indra/newview/skins/minimal/xui/en/panel_login.xml | 110 ++++++++++++---------
 1 file changed, 63 insertions(+), 47 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_login.xml b/indra/newview/skins/minimal/xui/en/panel_login.xml
index 74f985b9ec..8865f8fbc8 100644
--- a/indra/newview/skins/minimal/xui/en/panel_login.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_login.xml
@@ -5,18 +5,14 @@ height="600"
 layout="topleft"
 left="0"
 name="panel_login"
-top="600"
 focus_root="true" 
+top="600"
  width="996">
 <panel.string
      name="create_account_url">
        http://join.secondlife.com/
 </panel.string>
-<panel.string
-     name="real_url" translate="false">
-       http://secondlife.com/app/login/
-</panel.string>
-    <string name="reg_in_client_url" translate="false">
+<string name="reg_in_client_url" translate="false">
      http://secondlife.eniac15.lindenlab.com/reg-in-client/
 </string>
 <panel.string
@@ -33,10 +29,11 @@ bottom="600"
 follows="all"
 hide_loading="true"
 left="0"
-name="login_html_"
-start_url="http://upload.wikimedia.org/wikipedia/commons/3/37/Daylighting_-_Skylight.jpg"
-height="695"
-  width="996" />
+name="login_html"
+start_url=""
+top="0"
+height="600"
+     width="980" />
 <layout_stack
 follows="left|bottom|right"
 name="login_widgets"
@@ -70,8 +67,7 @@ Username:
   height="22"
   left_delta="0"
   max_chars="128"
-  prevalidate_callback="ascii"
-  select_on_focus="true"
+  combo_editor.prevalidate_callback="ascii"
   tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
   top_pad="0"
   name="username_combo"
@@ -85,7 +81,7 @@ Username:
 follows="left|bottom"
 font="SansSerifSmall"
 height="15"
-left_pad="8"
+left_pad="-19"
 name="password_text"
 top="20"
     width="150">
@@ -126,63 +122,83 @@ label="Remember password"
   font="SansSerifSmall"
   height="15"
   left_pad="18"
-  name="start_location_text"
+  name="mode_selection_text"
 top="20"
   width="130">
-       Start at:
+       Mode:
  </text>
 <combo_box
-allow_text_entry="true"
-control_name="LoginLocation"
   follows="left|bottom"
   height="23"
-max_chars="128"
-top_pad="0"
-name="start_location_combo"
-     width="170">
-<combo_box.item
-label="My last location"
-name="MyLastLocation"
-         value="last" />
+  max_chars="128"
+  top_pad="0"
+  control_name="SessionSettingsFile"
+  name="mode_combo"
+  width="120">
 <combo_box.item
-label="My home"
-name="MyHome"
-         value="home" />
+  label="Basic (Default)"
+  name="Basic"
+  value="settings_minimal.xml" />
 <combo_box.item
-label="&lt;Type region name&gt;"
-name="Typeregionname"   value="" />
+  label="Advanced"
+  name="Advanced"
+  value="" />
 </combo_box>
-<combo_box
-allow_text_entry="true"
-font="SansSerifSmall"
-   follows="left|right|bottom"
-   height="23"
-   max_chars="256"
-layout="topleft"
-top_pad="2"
-name="server_combo"
-width="135"
-  visible="false" />
 </layout_panel>
 <layout_panel
 tab_stop="false"
 follows="right|bottom"
 name="links"
-width="200"
-min_width="200"
+width="205"
+min_width="205"
 user_resize="false"
 height="80">
+   <text
+follows="right|bottom"
+font="SansSerifSmall"
+text_color="EmphasisColor"
+halign="right"
+height="16"
+top="12"
+right="-10"
+name="create_new_account_text"
+  width="200">
+       Sign up
+ </text>
+<text
+follows="right|bottom"
+font="SansSerifSmall"
+text_color="EmphasisColor"
+halign="right"
+height="16"
+name="forgot_password_text"
+top_pad="12"
+right="-10"
+  width="200">
+       Forgot your username or password?
+</text>
 <text
+follows="right|bottom"
+font="SansSerifSmall"
+text_color="EmphasisColor"
+halign="right"
+height="16"
+name="login_help"
+top_pad="2"
+right="-10"
+    width="200">
+       Need help logging in?   </text>
+<!--  <text
     follows="right|bottom"
-    font="SansSerifLarge"
+    font="SansSerifSmall"
     halign="right"
     height="28"
-    top_pad="12"
+    top_pad="2"
     name="channel_text"
     width="180"
     word_wrap="true">
-       Skylight FTW!
-   </text>
+       [VERSION]
+   </text>-->
    </layout_panel>
 </layout_stack>
 </panel>
-- 
cgit v1.2.3


From f3238a700eb387dc87d75c2ee0032ecad9e29b54 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 23 Feb 2011 16:41:46 -0800
Subject: remove skylight progress screen and unused skylight textures

---
 indra/newview/skins/minimal/xui/en/main_view.xml    |  9 +--------
 .../newview/skins/minimal/xui/en/panel_progress.xml | 21 ---------------------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 indra/newview/skins/minimal/xui/en/panel_progress.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 88f06d9e63..629496db81 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -121,14 +121,7 @@
                     left="0"
                     mouse_opaque="false"
                     name="world_view_rect"
-                    width="500">
-                <icon name="sl_watermark"
-                      image_name="sl_logo.png"
-                      left="5"
-                      top="5"
-                      width="100"
-                      height="45"/>
-              </panel>
+                    width="500"/>
             </layout_panel>
             <layout_panel auto_resize="false"
                    min_height="33"
diff --git a/indra/newview/skins/minimal/xui/en/panel_progress.xml b/indra/newview/skins/minimal/xui/en/panel_progress.xml
deleted file mode 100644
index 03e4ee5aed..0000000000
--- a/indra/newview/skins/minimal/xui/en/panel_progress.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="left|bottom|right|top"
- height="768"
- layout="topleft"
- left="0"
- name="login_progress_panel"
- background_visible="true"
- background_opaque="true"
- bg_opaque_image="login_teleport_background.jpg"
- top="768"
- width="1024">
-  <progress_bar
-   bottom="35"
-   color_bar="1 1 1 0.96"
-   height="16"
-   left="220"
-   name="login_progress_bar"
-   follows="left|right|bottom"
-   right="-220" />
-</panel>
-- 
cgit v1.2.3


From cc337162e3dec52e57e8dee6b564b7d186b9de4b Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 23 Feb 2011 16:43:06 -0800
Subject: SOCIAL-551 WIP Add buttons to open people and profile windows add
 people and profile buttons to bottom tray

---
 .../skins/minimal/xui/en/panel_bottomtray.xml      | 50 ++++++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 6c33a8f930..e9478c6465 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -223,10 +223,42 @@
          min_height="28"
          min_width="65"
          mouse_opaque="false"
-         name="help_panel"
+         name="people_panel"
          top_delta="0"
          user_resize="false"
-         width="85">
+         width="105">
+          <bottomtray_button
+             can_drag="false"
+            follows="left|right"
+            height="23"
+            image_pressed="PushButton_Press"
+            image_pressed_selected="PushButton_Selected_Press"
+            image_selected="PushButton_Selected_Press"
+            label="People"
+            layout="topleft"
+            left="0"
+            name="show_people_button"
+            tool_tip="Shows people window"
+            top="5"
+            use_ellipses="true"
+            width="100">
+            <bottomtray_button.commit_callback
+              function=""
+             parameter="" />
+          </bottomtray_button>
+        </layout_panel>
+      <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="65"
+         mouse_opaque="false"
+         name="profile_panel"
+         top_delta="0"
+         user_resize="false"
+         width="105">
           <bottomtray_button
              can_drag="false"
             follows="left|right"
@@ -234,20 +266,20 @@
             image_pressed="PushButton_Press"
             image_pressed_selected="PushButton_Selected_Press"
             image_selected="PushButton_Selected_Press"
-            label="How To"
+            label="Profile"
             layout="topleft"
             left="0"
-            name="help_btn"
-            tool_tip="Shows help window"
+            name="show_profile_btn"
+            tool_tip="Shows profile window"
+            is_toggle="true" 
             top="5"
             use_ellipses="true"
-            width="80">
+            width="100">
             <bottomtray_button.commit_callback
-              function="ShowHelp"
-             parameter="f1_help" />
+              function="ToggleAgentProfile"
+              parameter="agent"/>
           </bottomtray_button>
         </layout_panel>
-
         <layout_panel
          follows="left|right"
          height="30"
-- 
cgit v1.2.3


From c1c6914f5d8126398a72c05f0d28975ce48717de Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 23 Feb 2011 16:44:20 -0800
Subject: SOCIAL-551 WIP Add buttons to open people and profile windows remove
 dock button from undocked sidetray UI

---
 .../minimal/xui/en/panel_side_tray_tab_caption.xml | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_side_tray_tab_caption.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/minimal/xui/en/panel_side_tray_tab_caption.xml
new file mode 100644
index 0000000000..c8b0af154c
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_side_tray_tab_caption.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ bottom="0"
+ follows="left|top|right"
+ height="30"
+ width="333"
+ layout="topleft"
+ left="0"
+ name="sidetray_tab_panel">
+    <text
+     follows="left|top|right"
+     font="SansSerifHuge"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="sidetray_tab_title"
+     text_color="white"
+     top="4"
+     value="Side Panel"
+     width="255" />
+     <button
+     follows="right|top"
+     height="16"
+     image_selected="Icon_Help_Press"
+     image_unselected="Icon_Help_Foreground"
+     image_disabled="Icon_Help_Press"
+     layout="topleft"
+     name="show_help"
+     top="10"
+     right="-11"
+     width="16"
+     tool_tip="Show Help">
+        <button.commit_callback
+         function="Button.ShowHelp" />
+    </button>
+</panel>
-- 
cgit v1.2.3


From 598ee92b0e43748f065b82aa33404550c32dc3c4 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 11:06:42 -0800
Subject: SOCIAL-551 WIP Add buttons to open people and profile windows bring
 back sidetray container in minimal skin

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 629496db81..1fadd2d550 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -161,6 +161,16 @@
             </layout_panel>
           </layout_stack>
         </layout_panel>
+        <layout_panel auto_resize="false"
+                      follows="top|bottom"
+                      height="500"
+                      min_width="333"
+                      mouse_opaque="false"
+                      tab_stop="false"
+                      name="side_tray_container"
+                      user_resize="false"
+                      visible="false"
+                      width="333"/>
       </layout_stack>
       <debug_view follows="all"
                   left="0"
-- 
cgit v1.2.3


From 874da4cde8914de81992505ade8bc7f106a6019a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 18:37:06 -0800
Subject: SOCIAL-551 WIP add buttons to open people and profile windows
 ShowSideTrayPanel action can now toggle undocked panels
 OpenSidePanelsInFloaters works now Clossing a sidepanel floater will not
 return contents to side tray close button enabled in minimal skin for side
 panel floaters

---
 .../skins/minimal/xui/en/floater_web_content.xml   | 172 +++++++++++++++++++++
 1 file changed, 172 insertions(+)
 create mode 100644 indra/newview/skins/minimal/xui/en/floater_web_content.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/floater_web_content.xml b/indra/newview/skins/minimal/xui/en/floater_web_content.xml
new file mode 100644
index 0000000000..4a13339ee4
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/floater_web_content.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  legacy_header_height="18"
+  can_resize="true"
+  height="775"
+  layout="topleft"
+  min_height="400"
+  min_width="500"
+  name="floater_web_content"
+  help_topic="floater_web_content"
+  save_rect="true"
+  auto_tile="true"
+  title=""
+  initial_mime_type="text/html"
+  width="780">
+  <layout_stack
+    bottom="775"
+    follows="left|right|top|bottom"
+    layout="topleft"
+    left="5"
+    name="stack1"
+    orientation="vertical"
+    top="20"
+    width="770">
+    <layout_panel
+      auto_resize="false"
+      default_tab_group="1"
+      height="22"
+      layout="topleft"
+      left="0"
+      min_height="20"
+      name="nav_controls"
+      top="400"
+      user_resize="false"
+      width="770">
+      <button
+        image_overlay="Arrow_Left_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+		    hover_glow_amount="0.15"
+        tool_tip="Navigate back"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="1"
+        name="back"
+        top="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Back" />
+      </button>
+      <button
+        image_overlay="Arrow_Right_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        tool_tip="Navigate forward"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="27"
+        name="forward"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Forward" />
+      </button>
+      <button
+        image_overlay="Stop_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        tool_tip="Stop navigation"
+        enabled="true"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="stop"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Stop" />
+      </button>
+      <button
+        image_overlay="Refresh_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        tool_tip="Reload page"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="reload"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Reload" />
+      </button>
+      <combo_box
+        allow_text_entry="true"
+        follows="left|top|right"
+        tab_group="1"
+        height="22"
+        layout="topleft"
+        left_pad="4"
+        max_chars="1024"
+        name="address"
+        combo_editor.select_on_focus="true"
+        tool_tip="Enter URL here"
+        top_delta="0"
+        width="672">
+        <combo_box.commit_callback
+          function="WebContent.EnterAddress" />
+      </combo_box>
+      <icon
+        name="media_secure_lock_flag"
+        height="16"
+        follows="top|right"
+        image_name="Lock2"
+        layout="topleft"
+        left_delta="620"
+        top_delta="2"
+        visible="false" 
+        tool_tip="Secured Browsing"
+        width="16" />
+    </layout_panel>
+    <layout_panel
+      height="40"
+      layout="topleft"
+      left_delta="0"
+      name="external_controls"
+      top_delta="0"
+      user_resize="false"
+      width="585">
+      <web_browser
+        bottom="-22"
+        follows="all"
+        layout="topleft"
+        left="0"
+        name="webbrowser"
+        top="0"/>
+      <text
+        type="string"
+        length="200"
+        follows="bottom|left"
+        height="20"
+        layout="topleft"
+        left_delta="0"
+        name="statusbartext"
+        parse_urls="false"
+        text_color="0.4 0.4 0.4 1"
+        top_pad="5"
+        width="495"/>
+      <progress_bar
+        color_bar="0.3 1.0 0.3 1"
+        follows="bottom|right"
+        height="16"
+        top_delta="-1"
+        left_pad="24"
+        layout="topleft"
+        name="statusbarprogress"
+        width="64"/>
+    </layout_panel>
+  </layout_stack>
+</floater>
-- 
cgit v1.2.3


From 098145b15570b2f5b0358edc329d4852f226eba0 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 18:39:19 -0800
Subject: SOCIAL-551 WIP add buttons to open people and profile windows people
 button now shows people window

---
 indra/newview/skins/minimal/xui/en/main_view.xml   | 39 +++++++++-------------
 .../skins/minimal/xui/en/panel_bottomtray.xml      |  5 +--
 2 files changed, 19 insertions(+), 25 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 1fadd2d550..85e1045357 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -40,16 +40,7 @@
                   tab_stop="false" 
                   name="hud"
                   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"
+        <panel auto_resize="false"
                follows="all"
                height="500"
                layout="topleft"
@@ -57,7 +48,7 @@
                tab_stop="false"
                name="non_side_tray_view"
                user_resize="false"
-               width="500">
+               width="1024">
 
           <layout_stack border_size="0"
                         bottom="500"
@@ -160,18 +151,7 @@
               </panel>
             </layout_panel>
           </layout_stack>
-        </layout_panel>
-        <layout_panel auto_resize="false"
-                      follows="top|bottom"
-                      height="500"
-                      min_width="333"
-                      mouse_opaque="false"
-                      tab_stop="false"
-                      name="side_tray_container"
-                      user_resize="false"
-                      visible="false"
-                      width="333"/>
-      </layout_stack>
+        </panel>
       <debug_view follows="all"
                   left="0"
                   top="0"
@@ -181,6 +161,19 @@
                   width="1024"/>
     </layout_panel>
   </layout_stack>
+  <panel follows="top|bottom"
+         height="500"
+         mouse_opaque="false"
+         tab_stop="false"
+         name="hidden_side_tray"
+         visible="false"
+         width="333">
+    <panel
+      name="side_tray_container"
+      width="333"
+      height="500"/>
+  </panel>
+
   <panel top="0"
         follows="all"
         mouse_opaque="false"
diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index e9478c6465..4f696ccfe2 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -240,11 +240,12 @@
             name="show_people_button"
             tool_tip="Shows people window"
             top="5"
+            is_toggle="true"
             use_ellipses="true"
             width="100">
             <bottomtray_button.commit_callback
-              function=""
-             parameter="" />
+              function="ShowSidetrayPanel"
+             parameter="panel_people" />
           </bottomtray_button>
         </layout_panel>
       <layout_panel
-- 
cgit v1.2.3


From a8be9f4332ba0570fae721319298465b61f247fe Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 18:40:10 -0800
Subject: SOCIAL-551 FIX add buttons to open people and profile windows close
 button enabled in minimal skin for side panel floaters removed redundant
 heading from torn off side panel floaters

---
 .../skins/minimal/xui/en/floater_side_bar_tab.xml  | 10 ++++++++
 .../minimal/xui/en/panel_side_tray_tab_caption.xml | 28 +---------------------
 2 files changed, 11 insertions(+), 27 deletions(-)
 create mode 100644 indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml
new file mode 100644
index 0000000000..83b1260620
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ can_close="true"
+ can_resize="true"
+ min_width="333"
+ min_height="440"
+ save_rect="true"
+ save_visibility="true"
+ >
+</floater>
diff --git a/indra/newview/skins/minimal/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/minimal/xui/en/panel_side_tray_tab_caption.xml
index c8b0af154c..9f2f41ba31 100644
--- a/indra/newview/skins/minimal/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_side_tray_tab_caption.xml
@@ -3,35 +3,9 @@
  background_visible="true"
  bottom="0"
  follows="left|top|right"
- height="30"
+ height="5"
  width="333"
  layout="topleft"
  left="0"
  name="sidetray_tab_panel">
-    <text
-     follows="left|top|right"
-     font="SansSerifHuge"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="sidetray_tab_title"
-     text_color="white"
-     top="4"
-     value="Side Panel"
-     width="255" />
-     <button
-     follows="right|top"
-     height="16"
-     image_selected="Icon_Help_Press"
-     image_unselected="Icon_Help_Foreground"
-     image_disabled="Icon_Help_Press"
-     layout="topleft"
-     name="show_help"
-     top="10"
-     right="-11"
-     width="16"
-     tool_tip="Show Help">
-        <button.commit_callback
-         function="Button.ShowHelp" />
-    </button>
 </panel>
-- 
cgit v1.2.3


From 45fd3e53a1be97927ab81f566a15ef33834ed866 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 18:44:54 -0800
Subject: SOCIAL-555 WIP back quit confirmation notification re-enabled quit
 confirmation

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 4a808b19b7..97b9141534 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -9,7 +9,6 @@
   <respond name="TeleportOffered" response="Cancel"/>
   <respond name="ObjectGiveItem" response="Discard"/>
   <respond name="VoiceInviteGroup" response="Decline"/>
-  <respond name="ConfirmQuit" response="OK_okcancelignore"/>
   <respond name="YouHaveBeenLoggedOut" response="Cancel_okcancelbuttons"/>
   <hide name="HintInventory"/>
   <hide name="HintLindenDollar"/>
@@ -24,6 +23,7 @@
   <hide name="RegionEntryAccessBlocked"/>
   <show name="RegionRestartMinutes"/>
   <show name="RegionRestartSeconds"/>
+  <show name="ConfirmQuit"/>
   <show tag="fail"/>
   <show type="hint"/>
   <show type="notifytoast"/>
-- 
cgit v1.2.3


From 5e0305ce4ce4448a9d2251dd9691f37c7b7945e1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 19:23:18 -0800
Subject: SOCIAL-577 WIP create streamlined navigation bar made navigation bar
 appear in basic skin, with simplified UI

---
 indra/newview/skins/minimal/xui/en/main_view.xml   |   3 +-
 .../skins/minimal/xui/en/panel_navigation_bar.xml  | 119 ++++++++++++---------
 2 files changed, 73 insertions(+), 49 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 85e1045357..6e37266eff 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -23,7 +23,7 @@
                 orientation="vertical"
                 top="0">
     <layout_panel auto_resize="false"
-                  height="0"
+                  height="30"
                   mouse_opaque="false"
                   name="nav_bar_container"
                   tab_stop="false"
@@ -112,6 +112,7 @@
                     left="0"
                     mouse_opaque="false"
                     name="world_view_rect"
+                     top="0" 
                     width="500"/>
             </layout_panel>
             <layout_panel auto_resize="false"
diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index 729321675b..3ef5b9b0de 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -9,7 +9,7 @@
  name="navigation_bar"
  chrome="true"
  width="600">
-	<icon
+  <icon
 	 follows="all"
 	 image_name="NavBar_BG"
 	 mouse_opaque="false"
@@ -20,7 +20,7 @@
 	 top="0"
 	 height="26"
 	 width="600"/>
-	<icon
+  <icon
 	 follows="all"
 	 image_name="NavBar_BG_NoFav_Bevel"
 	 mouse_opaque="false"
@@ -31,7 +31,7 @@
 	 top="0"
 	 height="26"
 	 width="600"/>
-	<icon
+  <icon
 	 follows="all"
 	 image_name="NavBar_BG_NoNav_Bevel"
 	 mouse_opaque="false"
@@ -42,7 +42,7 @@
 	 top="0"
 	 height="26"
 	 width="600"/>
-	<panel
+  <panel
 	 background_visible="false"
 	 follows="left|top|right"
 	 top="3"
@@ -50,48 +50,71 @@
 	 layout="topleft"
 	 name="navigation_panel"
 	 width="600">
-	    <location_input
-	     follows="left|right|top"
-	     halign="right"
-	     height="23"
-	     label="Location"
-	     layout="topleft"
-	     left="7"
-	     max_chars="254"
-	     mouse_opaque="false"
-	     name="location_combo"
-       enabled="false"
-	     top="0"
-	     width="550">
-        <combo_editor
-          text_color="White"
-          background_image=""/>
-        <maturity_button
-          width="0"
-          height="0"/>
-        <info_button
-          width="0"
-          image_unselected=""
-          image_disabled="" 
-          visible="false"/>
-        <add_landmark_button
-          visible="false"/>
-        <combo_button
-          width="0"
-          image_unselected=""
-          visible="false"/>
-        <combo_list
-         mouse_wheel_opaque="true"/>
-	    </location_input>
-      <button
-        right="-5" 
-        top="2"
-        width="16"
-        height="16" 
-        follows="top|right" 
-        name="skylight_help"
-        image_unselected="Icon_Help_Foreground"
-        image_selected="Icon_Help_Press"
-        />
-	</panel>
+    <pull_button
+follows="left|top"
+direction="down"
+height="23"
+image_overlay="Arrow_Left_Off"
+image_bottom_pad="1"
+layout="topleft"
+left="10"
+name="back_btn"
+tool_tip="Go back to previous location"
+top="2"
+width="31" />
+    <pull_button
+     follows="left|top"
+     direction="down"
+     height="23"
+     image_overlay="Arrow_Right_Off"
+     image_bottom_pad="1"
+     layout="topleft"
+     left_pad="0"
+     name="forward_btn"
+     tool_tip="Go forward one location"
+     top_delta="0"
+     width="31" />
+    <location_input
+     follows="left|right|top"
+     halign="right"
+     height="23"
+     label="Location"
+     layout="topleft"
+     left_pad="7"
+     max_chars="254"
+     mouse_opaque="false"
+     name="location_combo"
+     top_delta="0"
+     width="360">
+      <maturity_button
+        width="0"
+        height="0"/>
+      <info_button
+        width="0"
+        image_unselected=""
+        image_disabled=""
+        visible="false"/>
+      <add_landmark_button
+        visible="false"/>
+    </location_input>
+    <icon follows="right"
+          height="20"
+          width="2"
+          left_pad="2"
+          image_name="Button_Separator"
+          name="separator"
+          top="2"/>
+    <button
+      right="-70"
+      top="2"
+      width="80"
+      height="22"
+      label="How To"
+      follows="top|right"
+      name="skylight_help">
+      <commit_callback
+        function="ShowHelp"
+        parameter="f1_help" />
+    </button>
+  </panel>
 </panel>
-- 
cgit v1.2.3


From 318842b15871cbee47a944ed243352258211321d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 19:35:15 -0800
Subject: SOCIAL-552 FIX removed badges from address field in navigation bar

---
 .../skins/minimal/xui/en/panel_navigation_bar.xml  | 44 +++++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index 3ef5b9b0de..e5548cce5e 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -86,15 +86,49 @@ width="31" />
      name="location_combo"
      top_delta="0"
      width="360">
+      <add_landmark_button
+        width="0"
+        height="0"
+        visible="false"/>
       <maturity_button
         width="0"
-        height="0"/>
-      <info_button
+        height="0"
+        visible="false"/>
+      <for_sale_button
         width="0"
-        image_unselected=""
-        image_disabled=""
+        height="0"
         visible="false"/>
-      <add_landmark_button
+      <voice_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <fly_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <push_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <build_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <scripts_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <damage_icon
+        width="0"
+        height="0"
+        visible="false"/>
+      <damage_text 
+        width="0"
+        max_length="0"
+        visible="false"/>
+      <info_button
+        width="0"
+        height="0"
         visible="false"/>
     </location_input>
     <icon follows="right"
-- 
cgit v1.2.3


From d6259a3032631a886214b765299a4932973128fb Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 19:42:28 -0800
Subject: SOCIAL-552 FIX removed badges from address field in navigation bar
 modified widget template instead of instance

---
 .../skins/minimal/xui/en/panel_navigation_bar.xml  |  44 -------
 .../minimal/xui/en/widgets/location_input.xml      | 131 +++++++++++++++++++++
 2 files changed, 131 insertions(+), 44 deletions(-)
 create mode 100644 indra/newview/skins/minimal/xui/en/widgets/location_input.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index e5548cce5e..65d9e8a2ab 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -86,50 +86,6 @@ width="31" />
      name="location_combo"
      top_delta="0"
      width="360">
-      <add_landmark_button
-        width="0"
-        height="0"
-        visible="false"/>
-      <maturity_button
-        width="0"
-        height="0"
-        visible="false"/>
-      <for_sale_button
-        width="0"
-        height="0"
-        visible="false"/>
-      <voice_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <fly_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <push_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <build_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <scripts_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <damage_icon
-        width="0"
-        height="0"
-        visible="false"/>
-      <damage_text 
-        width="0"
-        max_length="0"
-        visible="false"/>
-      <info_button
-        width="0"
-        height="0"
-        visible="false"/>
     </location_input>
     <icon follows="right"
           height="20"
diff --git a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
new file mode 100644
index 0000000000..fe06a2d816
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+*TODO: Replace hardcoded buttons width/height with getting this info from the button images.
+       Currently that doesn't work because LLUIImage::getWidth/getHeight() return 1 for the images.
+-->
+<location_input font="SansSerifSmall"
+                maturity_help_topic="maturity_rating"
+                add_landmark_hpad="0"
+                icon_hpad="2"
+                allow_text_entry="true"
+                list_position="below"
+      	        show_text_as_tentative="false"
+                max_chars="20"
+                follows="left|top"
+                allow_new_values="true"
+                >
+  <!-- *NOTE: Tooltips are in strings.xml so they can be localized.
+  See LocationCtrlAddLandmarkTooltip etc. -->
+  <info_button
+    name="Place Information"
+    width="0"
+    height="0"
+    visible="false" 
+    left="6"
+    top="20"
+    follows="left|top"
+    hover_glow_amount="0.15" />
+  <add_landmark_button name="Add Landmark"
+                       hover_glow_amount="0.15"
+                       width="0"
+                       height="0"
+                       visible="false" 
+                       follows="right|top"
+                       scale_image="false"
+                       top="19"
+                       left="-3" />
+  <maturity_button
+    name="maturity_icon"
+    width="0"
+    height="0"
+    visible="false" 
+    top="20"
+    follows="left|top"
+    />
+  <for_sale_button
+    name="for_sale_btn"
+    width="0"
+    height="0"
+    visible="false" 
+    follows="right|top"
+    scale_image="false"
+    top="21"
+    />
+  <voice_icon
+    enabled="true"
+    name="voice_icon"
+    width="0"
+    height="0"
+    visible="false" 
+    top="21"
+    follows="right|top"
+    />
+  <fly_icon
+    name="fly_icon"
+    width="0"
+    height="0"
+    visible="false" 
+    top="21"
+    follows="right|top"
+    />
+  <push_icon
+    name="push_icon"
+    width="0"
+    height="0"
+    visible="false" 
+    top="21"
+    follows="right|top"
+    />
+  <build_icon
+    name="build_icon"
+    width="0"
+    height="0"
+    visible="false" 
+    top="21"
+    follows="right|top"
+    />
+  <scripts_icon
+    name="scripts_icon"
+    width="0"
+    height="0"
+    visible="false" 
+    top="21"
+    follows="right|top"
+    />
+  <damage_icon
+    name="damage_icon"
+    width="0"
+    height="0"
+    visible="false" 
+    top="19"
+    left="2"
+    follows="right|top"
+    />
+  <!-- Default text color is invisible on top of nav bar background -->
+  <damage_text
+    name="damage_text"
+    width="0"
+    height="0"
+    max_length="0" 
+    top="17"
+    follows="right|top"
+    halign="right"
+	  font="SansSerifSmall"
+	  text_color="TextFgColor"
+	/>
+  <combo_button
+		name="Location History"
+                label=""
+                pad_right="0"/>
+  <combo_list
+	      bg_writeable_color="MenuDefaultBgColor"
+	      page_lines="10"
+              scroll_bar_bg_visible="true" />
+  <combo_editor name="Combo Text Entry"
+                text_pad_left="4"
+                select_on_focus="false"
+                font="SansSerifSmall"
+                bevel_style="none"
+                border_style="line"
+                border.border_thickness="0" />
+</location_input>
-- 
cgit v1.2.3


From 69a84d1e4cd25d6b440cffc1306604c45100475b Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 09:58:56 -0800
Subject: remove flicker from top of world view

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 6e37266eff..89afb302a8 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -43,6 +43,7 @@
         <panel auto_resize="false"
                follows="all"
                height="500"
+               top="0" 
                layout="topleft"
                mouse_opaque="false"
                tab_stop="false"
@@ -55,6 +56,7 @@
                         follows="all"
                         height="500"
                         left="0"
+                        top="0" 
                         mouse_opaque="false"
                         name="world_stack"
                         open_time_constant="0.03"
-- 
cgit v1.2.3


From 87a0aaa7d8365035951c069a69994dbaeb688a87 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 11:22:35 -0800
Subject: fixed some layout on basic mode login screen

---
 indra/newview/skins/minimal/xui/en/panel_login.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_login.xml b/indra/newview/skins/minimal/xui/en/panel_login.xml
index 8865f8fbc8..9b07051d81 100644
--- a/indra/newview/skins/minimal/xui/en/panel_login.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_login.xml
@@ -47,8 +47,8 @@ auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="695"
-min_width="695"
+width="570"
+min_width="570"
 user_resize="false"
 height="80">
 <text
@@ -90,6 +90,7 @@ top="20"
 <line_editor
 follows="left|bottom"
   height="22"
+left_delta="0" 
   max_length_bytes="16"
 name="password_edit"
 is_password="true"
@@ -121,7 +122,7 @@ label="Remember password"
   follows="left|bottom"
   font="SansSerifSmall"
   height="15"
-  left_pad="18"
+  left_pad="10"
   name="mode_selection_text"
 top="20"
   width="130">
-- 
cgit v1.2.3


From 31d0bf5ba5dd5e1df6c42dd19ce63ef3978a2f4c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 13:48:20 -0800
Subject: updates destination guide and avatar picker urls added close button
 to destination guide and avatar picker

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 89afb302a8..2a3107398d 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -124,20 +124,20 @@
                    name="bottom_tray_container"
                    visible="false"/>
             <layout_panel auto_resize="false"
-                          height="195"
+                          height="200"
                           mouse_opaque="false"
                           user_resize="false"
                           name="avatar_picker_and_destination_guide_container"
                           visible="false">
               <panel top="0"
-                     height="195"
+                     height="200"
                      left="0"
                      background_visible="true" 
                      width="500"
                      follows="all">
                 <web_browser
                   top="0"
-                  height="195"
+                  height="200"
                   follows="all"
                   name="destination_guide_contents"
                   trusted_content="true"
@@ -145,12 +145,24 @@
                   start_url="http://interest.secondlife/viewer/guide"/>
                 <web_browser
                   top="0"
-                  height="195"
+                  height="200"
                   follows="all"
                   name="avatar_picker_contents"
                   visible="false"
                   trusted_content="true"
                   start_url="http://interest.secondlife/viewer/avatar"/>
+                <button
+                  name="close"
+                  width="22"
+                  height="23"
+                  right="-10" 
+                  top="2" 
+                  follows="top|right" 
+                  chrome="true" 
+                  tab_stop="false" 
+                  image_unselected="bottomtray_close_off"
+                  image_selected="bottomtray_close_press"
+                  />
               </panel>
             </layout_panel>
           </layout_stack>
-- 
cgit v1.2.3


From 4619a1e58bd53307bf5b2e326d814eddad73fbb1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 15:13:21 -0800
Subject: SOCIAL-550 FIX Add back media volume and play/pause buttons to top
 bar SOCIAL-577 FIX create streamlined navigation bar

---
 indra/newview/skins/minimal/xui/en/main_view.xml   |   9 +
 .../skins/minimal/xui/en/panel_navigation_bar.xml  |  24 +-
 .../minimal/xui/en/panel_prim_media_controls.xml   | 581 ---------------------
 .../skins/minimal/xui/en/panel_status_bar.xml      |  62 +++
 .../skins/minimal/xui/en/panel_volume_pulldown.xml |  34 ++
 5 files changed, 106 insertions(+), 604 deletions(-)
 delete mode 100644 indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_status_bar.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_volume_pulldown.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 2a3107398d..5906205636 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -176,6 +176,15 @@
                   width="1024"/>
     </layout_panel>
   </layout_stack>
+  <panel mouse_opaque="false"
+       follows="right|top"
+       name="status_bar_container"
+       tab_stop="false"
+       height="30"
+       left="-70"
+       top="0"
+       width="70"
+       visible="false"/>
   <panel follows="top|bottom"
          height="500"
          mouse_opaque="false"
diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index 65d9e8a2ab..cd21242edc 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -9,35 +9,13 @@
  name="navigation_bar"
  chrome="true"
  width="600">
-  <icon
-	 follows="all"
-	 image_name="NavBar_BG"
-	 mouse_opaque="false"
-	 name="bg_icon"
-	 scale_image="true"
-	 visible="true"
-	 left="0"
-	 top="0"
-	 height="26"
-	 width="600"/>
   <icon
 	 follows="all"
 	 image_name="NavBar_BG_NoFav_Bevel"
 	 mouse_opaque="false"
 	 name="bg_icon_no_fav_bevel"
 	 scale_image="true"
-	 visible="false"
-	 left="0"
-	 top="0"
-	 height="26"
-	 width="600"/>
-  <icon
-	 follows="all"
-	 image_name="NavBar_BG_NoNav_Bevel"
-	 mouse_opaque="false"
-	 name="bg_icon_no_nav_bevel"
-	 scale_image="true"
-	 visible="false"
+	 visible="true"
 	 left="0"
 	 top="0"
 	 height="26"
diff --git a/indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml
deleted file mode 100644
index dfc8f55b03..0000000000
--- a/indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml
+++ /dev/null
@@ -1,581 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-	follows="left|right|top|bottom"
-	name="MediaControls"
-	background_visible="false"
-	height="200"
-	layout="topleft"
-	help_topic="prim_media_controls"
-	mouse_opaque="false"
-	min_width="300"
-	width="800">
-  <string name="control_background_image_name">Inspector_Background</string>
-  <string name="skip_step">0.2</string>
-  <string name="min_width">300</string>
-  <string name="min_height">75</string>
-  <string name="zoom_near_padding">1.0</string>
-  <string name="zoom_medium_padding">1.1</string>
-  <string name="zoom_far_padding">1.5</string>
-  <string name="top_world_view_avoid_zone">50</string>
-  <layout_stack
-	  name="progress_indicator_area"
-	  follows="left|right|top"
-	  height="8"
-	  layout="topleft"
-	  animate="false"
-	  left="0"
-	  orientation="horizontal"
-	  top="22">
-	<!-- outer layout_panels center the inner one -->
-	<layout_panel
-		width="0"
-		name="left_bookend_bottom"
-		mouse_opaque="false"
-		layout="topleft"
-		user_resize="false" />
-	<layout_panel
-		name="media_progress_indicator"
-		mouse_opaque="false"
-		height="8"
-		layout="topleft"
-		left="0"
-		top="0"
-		auto_resize="false"
-		user_resize="false"
-		min_width="100"
-		width="200">
-	  <progress_bar
-		  name="media_progress_bar"
-		  color_bg="1 1 1 1"
-		  color_bar="1 1 1 0.96"
-		  follows="left|right|top"
-		  height="8"
-		  layout="topleft"
-		  top="0"
-		  left="0"
-		  tool_tip="Media is Loading"/>
-	</layout_panel>
-	<layout_panel
-		name="right_bookend_bottom"
-		width="0"
-		mouse_opaque="false"
-		layout="topleft"
-		user_resize="false" />
-  </layout_stack>
-  <layout_stack
-	  name="media_controls"
-	  follows="left|right|top"
-	  animate="false"
-	  height="75"
-	  layout="topleft"
-	  top="0"
-	  left="0"
-	  border_size="0"
-	  mouse_opaque="false"
-	  orientation="horizontal">
-	<!-- outer layout_panels center the inner one -->
-	<layout_panel
-		name="left_bookend"
-		top="0"
-		width="0"
-		mouse_opaque="false"
-		layout="topleft"
-		user_resize="false" />
-	<layout_panel
-		name="back"
-		top="0"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		mouse_opaque="false"
-		min_width="22"
-		width="22">
-	  <button
-		  name="back_btn"
-		  follows="top"
-		  image_overlay="Arrow_Left_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  auto_resize="false"
-		  layout="topleft"
-		  tool_tip="Navigate back"
-		  top="0"
-		  left="0"
-		  width="22"
-		  height="22">
-		<button.commit_callback
-			function="MediaCtrl.Back" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="fwd"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		min_width="22"
-		top="0"
-		height="22"
-		width="22">
-	  <button
-		  name="fwd_btn"
-		  follows="top"
-		  image_overlay="Arrow_Right_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  top="0"
-		  height="22"
-		  width="22"
-		  layout="topleft"
-		  tool_tip="Navigate forward">
-		<button.commit_callback
-			function="MediaCtrl.Forward" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="home"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		height="22"
-		min_width="22"
-		width="22">
-	  <button
-		  name="home_btn"
-		  follows="top"
-		  image_overlay="Home_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  layout="topleft"
-		  tool_tip="Home page"
-		  top="0"
-		  height="22"
-		  width="22">
-		<button.commit_callback
-			function="MediaCtrl.Home" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="media_stop"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		height="22"
-		min_width="22"
-		width="22">
-	  <button
-		  name="media_stop_btn"
-		  follows="top"
-		  image_overlay="Stop_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  layout="topleft"
-		  tool_tip="Stop media"
-		  top="0"
-		  height="22"
-		  width="22">
-		<button.commit_callback
-			function="MediaCtrl.MediaStop" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="reload"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		height="22"
-		min_width="22"
-		width="22">
-	  <button
-		  name="reload_btn"
-		  follows="top"
-		  image_overlay="Refresh_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  layout="topleft"
-		  tool_tip="Reload"
-		  top="0"
-		  height="22"
-		  width="22">
-		<button.commit_callback
-			function="MediaCtrl.Reload" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="stop"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		height="22"
-		min_width="22"
-		width="22">
-	  <button
-		  name="stop_btn"
-		  follows="top"
-		  image_overlay="StopReload_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  layout="topleft"
-		  tool_tip = "Stop loading"
-		  top="0"
-		  height="22"
-		  width="22">
-		<button.commit_callback
-			function="MediaCtrl.Stop" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="play"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		height="22"
-		min_width="22"
-		width="22">
-	  <button
-		  name="play_btn"
-		  follows="top"
-		  image_overlay="Play_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  layout="topleft"
-		  tool_tip = "Play media"
-		  top="0"
-		  height="22"
-		  width="22">
-		<button.commit_callback
-			function="MediaCtrl.Play" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="pause"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		min_width="22"
-		width="22">
-	  <button
-		  name="pause_btn"
-		  follows="top"
-		  image_overlay="Pause_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  layout="topleft"
-		  top="0"
-		  height="22"
-		  width="22"
-		  tool_tip = "Pause media">
-		<button.commit_callback
-			function="MediaCtrl.Pause" />
-	  </button>
-	</layout_panel>
-	<!-- media URL entry  -->
-	<layout_panel
-		name="media_address"
-		mouse_opaque="false"
-		auto_resize="true"
-		user_resize="false"
-		height="24"
-		follows="left|right|bottom"
-		layout="topleft"
-		top="0"
-		width="190"
-		min_width="90">
-	  <text 
-		  name="media_address_url"
-		  follows="top|left|right" 
-		  height="22"
-		  top="5"
-      valign="bottom" 
-		  tool_tip="Media URL"
-		  text_pad_right="16"> 
-      http://www.secondlife.com
-	  </text>
-	  <layout_stack
-		  name="media_address_url_icons"
-		  animate="false"
-		  follows="top|right"
-		  height="20"
-		  width="38"
-		  top="0"
-		  right="-1"
-		  border_size="0"
-		  mouse_opaque="false"
-		  orientation="horizontal">
-		<layout_panel
-			layout="topleft"
-			width="16"
-			mouse_opaque="false"
-			auto_resize="false"
-			user_resize="false">
-		  <icon
-			  name="media_whitelist_flag"
-			  follows="top|right"
-			  height="16"
-			  image_name="Flag"
-			  layout="topleft"
-			  tool_tip="White List enabled"
-			  width="16" />
-		</layout_panel>
-		<layout_panel
-			layout="topleft"
-			width="16"
-			mouse_opaque="false"
-			auto_resize="false"
-			user_resize="false">
-		  <icon
-			  name="media_secure_lock_flag"
-			  height="16"
-			  image_name="Lock2"
-			  layout="topleft"
-			  tool_tip="Secured Browsing"
-			  width="16" />
-		</layout_panel>
-	  </layout_stack>
-	</layout_panel>
-	<layout_panel
-		name="media_play_position"
-		mouse_opaque="false"
-		auto_resize="true"
-		user_resize="false"
-		follows="left|right"
-		layout="topleft"
-		top="0"
-		height="22"
-		min_width="100"
-		width="200">
-	  <slider_bar
-		  name="media_play_slider"
-		  follows="left|right|top"
-		  top="0"
-		  height="22"
-		  increment="0.01"
-		  initial_value="0.5"
-		  layout="topleft"
-		  tool_tip="Movie play progress"
-		  width="200">
-		<slider_bar.commit_callback
-			function="MediaCtrl.JumpProgress" />
-	  </slider_bar>
-	</layout_panel>
-	<layout_panel
-		name="skip_back"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		min_width="22"
-		width="22">
-	  <button
-		  name="skip_back_btn"
-		  follows="top"
-		  image_overlay="SkipBackward_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  auto_resize="false"
-		  height="22"
-		  layout="topleft"
-		  tool_tip="Step back"
-		  top="0"
-		  width="22"
-		  left="0">
-		<button.commit_callback
-			function="MediaCtrl.SkipBack" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="skip_forward"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		min_width="22"
-		width="22">
-	  <button
-		  name="skip_forward_btn"
-		  follows="top"
-		  image_overlay="SkipForward_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  height="22"
-		  layout="topleft"
-		  tool_tip="Step forward"
-		  top="0"
-		  width="22">
-		<button.commit_callback
-			function="MediaCtrl.SkipForward" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="media_volume"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		height="72"
-		min_width="22"
-		width="22">
-	  <!-- Note: this is not quite right either...the mute button is not the -->
-	  <!-- same as the others because it cannot have the "image_overlay" be  -->
-	  <!-- two different images.  -->
-	  <!-- Note also: the button and the slider must overlap! -->
-	  <button
-		  name="media_mute_button"
-		  follows="top"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="AudioMute_Off"
-		  image_unselected="Audio_Off"
-		  hover_glow_amount="0.15"
-		  is_toggle="true"
-		  layout="topleft"
-		  scale_image="false" 
-		  tool_tip="Mute This Media"
-		  top="0"
-		  height="20"
-		  width="22" >
-		<button.commit_callback
-			function="MediaCtrl.ToggleMute" />
-		<button.mouseenter_callback
-			function="MediaCtrl.ShowVolumeSlider" />
-		<button.mouseleave_callback
-			function="MediaCtrl.HideVolumeSlider" />
-	  </button>
-	  <slider
-		  orientation="vertical"
-		  left="0"
-		  top="16"
-		  height="50"
-		  layout="topleft"
-		  increment="0.01"
-		  initial_value="0.5"
-		  name="volume_slider"
-		  tool_tip="Media Volume"
-		  show_text="false"
-		  volume="true">
-		<slider.commit_callback
-			function="MediaCtrl.Volume"/>
-		<slider.mouseenter_callback
-			function="MediaCtrl.ShowVolumeSlider" />
-		<slider.mouseleave_callback
-			function="MediaCtrl.HideVolumeSlider" />
-	  </slider>
-	</layout_panel>
-	<layout_panel
-		name="zoom_frame"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		height="28"
-		min_width="22"
-		width="22">
-	  <button
-		  name="zoom_frame_btn"
-		  follows="top"
-		  image_overlay="Zoom_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  top="0"
-		  height="22"
-		  layout="topleft"
-		  tool_tip="Zoom into media"
-		  width="22">
-		<button.commit_callback
-			function="MediaCtrl.Zoom" />
-	  </button>
-	</layout_panel>
-	<layout_panel
-		name="close"
-		mouse_opaque="false"
-		auto_resize="false"
-		user_resize="false"
-		layout="topleft"
-		top="0"
-		min_width="21"
-		width="21" >
-	  <button
-		  name="close_btn"
-		  follows="top"
-		  image_overlay="UnZoom_Off"
-		  image_disabled="PushButton_Disabled"
-		  image_disabled_selected="PushButton_Disabled"
-		  image_selected="PushButton_Selected"
-		  image_unselected="PushButton_Off"
-		  hover_glow_amount="0.15"
-		  top="0"
-		  height="22"
-		  layout="topleft"
-		  tool_tip ="Zoom Back"
-		  top_delta="-4"
-		  width="21" >
-		<button.commit_callback
-			function="MediaCtrl.Close" />
-	  </button>
-	</layout_panel>
-	<!-- bookend panel -->
-	<layout_panel
-		name="right_bookend"
-		mouse_opaque="false"
-		top="0"
-		width="0"
-		layout="topleft"
-		user_resize="false" />
-  </layout_stack>
-  <panel
-	  name="media_region"
-	  height="100"
-	  follows="left|right|top|bottom"
-	  layout="topleft"
-	  mouse_opaque="false"
-	  top="30" />
-</panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
new file mode 100644
index 0000000000..6ccd0e938d
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_color="MouseGray"
+ chrome="true"
+ follows="top|right"
+ height="30"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="status"
+ top="19"
+ tab_stop="false"
+ width="70">
+    <panel.string
+     name="packet_loss_tooltip">
+        Packet Loss
+    </panel.string>
+    <panel.string
+     name="bandwidth_tooltip">
+        Bandwidth
+    </panel.string>
+    <panel.string
+     name="time">
+        [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
+    </panel.string>
+    <panel.string
+     name="timeTooltip">
+        [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
+    </panel.string>
+	<panel.string
+     name="buycurrencylabel">
+        L$ [AMT]
+    </panel.string>
+     <button
+     follows="right|top"
+     height="16"
+     image_selected="Play_Off"
+     image_unselected="Pause_Off"
+     image_pressed="Pause_Press"
+     image_pressed_selected="Play_Press"
+     is_toggle="true"
+     left="15"
+     top="7"
+     name="media_toggle_btn"
+     tool_tip="Start/Stop All Media (Music, Video, Web pages)"
+     width="16" >
+    </button>
+    <button
+     follows="right|top"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_pressed="Audio_Press"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     left_pad="5"
+     top="8"
+     name="volume_btn"
+     tool_tip="Global Volume Control"
+     width="16" />
+</panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/minimal/xui/en/panel_volume_pulldown.xml
new file mode 100644
index 0000000000..36ad39abe8
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_volume_pulldown.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_image="Volume_Background" 
+ bg_alpha_image="Volume_Background" 
+ border_visible="false"
+ border="false"
+ chrome="true"
+ follows="bottom"
+ height="150"
+ layout="topleft"
+ name="volumepulldown_floater"
+ width="32">
+ <slider
+  control_name="AudioLevelMaster"
+  follows="left|top"
+  left="0"
+  top="1"
+  orientation="vertical"
+  height="140"
+  increment="0.05"
+  initial_value="0.5"
+  layout="topleft"
+  name="mastervolume"
+  show_text="false"
+  slider_label.halign="right"
+  top_pad="2"
+  volume="true">
+  <slider.commit_callback
+   function="Vol.setControlFalse"
+   parameter="MuteAudio" />
+  </slider>
+</panel>
-- 
cgit v1.2.3


From 83e6244c89da61b82e4153b156f69eecac90eee6 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 15:44:57 -0800
Subject: SOCIAL-544 FIX allow teleport offers from other avatars

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 97b9141534..0dcab1adb6 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -6,7 +6,6 @@
   <respond name="VoiceInviteAdHoc" response="Decline"/>
   <respond name="OfferFriendship" response="Decline"/>
   <respond name="OfferFriendshipNoMessage" response="Decline"/>
-  <respond name="TeleportOffered" response="Cancel"/>
   <respond name="ObjectGiveItem" response="Discard"/>
   <respond name="VoiceInviteGroup" response="Decline"/>
   <respond name="YouHaveBeenLoggedOut" response="Cancel_okcancelbuttons"/>
-- 
cgit v1.2.3


From 602c8dc2d877fb37dc08cb9832d057e7df2c9952 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 15:45:47 -0800
Subject: SOCIAL-556 FIX Allow friend requests

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 0dcab1adb6..e954d69118 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -4,8 +4,6 @@
   <respond name="JoinGroup" response="Decline"/>
   <respond name="VoiceInviteP2P" response="Decline"/>
   <respond name="VoiceInviteAdHoc" response="Decline"/>
-  <respond name="OfferFriendship" response="Decline"/>
-  <respond name="OfferFriendshipNoMessage" response="Decline"/>
   <respond name="ObjectGiveItem" response="Discard"/>
   <respond name="VoiceInviteGroup" response="Decline"/>
   <respond name="YouHaveBeenLoggedOut" response="Cancel_okcancelbuttons"/>
-- 
cgit v1.2.3


From 740b4959a8fb8b2be61e1263c454e0843ce67226 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 16:27:19 -0800
Subject: SOCIAL-554 FIX Allow right click of other avatars

---
 .../skins/minimal/xui/en/menu_avatar_other.xml     | 58 ++++++++++++++++++++--
 1 file changed, 54 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml b/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml
index 76734440e9..b76629f401 100644
--- a/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_avatar_other.xml
@@ -3,19 +3,69 @@
 <context_menu
  layout="topleft"
  name="Avatar Pie">
+    <menu_item_call
+     label="View Profile"
+     name="Profile...">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="hit object" />
+    </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Add Friend"
+     name="Add Friend">
+        <menu_item_call.on_click
+         function="Avatar.AddFriend" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableAddFriend" />
+    </menu_item_call>
     <menu_item_call
      label="IM"
      name="Send IM...">
         <menu_item_call.on_click
          function="Avatar.SendIM" />
     </menu_item_call>
+   <menu_item_separator />
     <menu_item_call
-     label="About..."
-     name="About...">
-        <on_click
-         function="Avatar.ShowInspector" />
+     enabled="false"
+     label="Block"
+     name="Avatar Mute">
+        <menu_item_call.on_click
+         function="Avatar.Mute" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableMute" />
     </menu_item_call>
     <menu_item_call
+     label="Report"
+     name="abuse">
+        <menu_item_call.on_click
+         function="Avatar.ReportAbuse" />
+    </menu_item_call>
+        <menu_item_call
+         label="Freeze"
+         name="Freeze...">
+            <menu_item_call.on_click
+             function="Avatar.Freeze" />
+            <menu_item_call.on_visible
+             function="Avatar.EnableFreezeEject"/>
+        </menu_item_call>
+        <menu_item_call
+         label="Eject"
+         name="Eject...">
+            <menu_item_call.on_click
+             function="Avatar.Eject" />
+            <menu_item_call.on_visible
+             function="Avatar.EnableFreezeEject"/>
+        </menu_item_call>
+        <menu_item_call
+         label="Debug Textures"
+         name="Debug...">
+            <menu_item_call.on_click
+             function="Avatar.Debug" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+        </menu_item_call>
+	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
         <menu_item_call.on_click
-- 
cgit v1.2.3


From 7eee709d777e9668126bdb1dd2e0b234f29b2b4e Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 16:29:33 -0800
Subject: SOCIAL-560 FIX enable notification of paid/received lindens

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index e954d69118..fc1810623d 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -6,7 +6,6 @@
   <respond name="VoiceInviteAdHoc" response="Decline"/>
   <respond name="ObjectGiveItem" response="Discard"/>
   <respond name="VoiceInviteGroup" response="Decline"/>
-  <respond name="YouHaveBeenLoggedOut" response="Cancel_okcancelbuttons"/>
   <hide name="HintInventory"/>
   <hide name="HintLindenDollar"/>
   <hide name="HintMove"/>
@@ -22,6 +21,7 @@
   <show name="RegionRestartSeconds"/>
   <show name="ConfirmQuit"/>
   <show tag="fail"/>
+  <show tag="funds"/>
   <show type="hint"/>
   <show type="notifytoast"/>
   <show name="ModeChange"/>
-- 
cgit v1.2.3


From ae29fc39173cc81f9d27b55582d49a4d26e7b411 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 16:09:17 -0800
Subject: SOCIAL-554 FIX Allow right click of other avatars made attachment
 menu consistent with avatar menu

---
 .../skins/minimal/xui/en/menu_attachment_other.xml | 98 +++++++++++++++++-----
 1 file changed, 78 insertions(+), 20 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
index d99c7c929b..58ad9214c0 100644
--- a/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
@@ -3,33 +3,91 @@
 <context_menu
  layout="topleft"
  name="Avatar Pie">
+    <menu_item_call
+     label="View Profile"
+     name="Profile...">
+        <menu_item_call.on_click
+         function="ShowAgentProfile"
+         parameter="hit object" />
+    </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Add Friend"
+     name="Add Friend">
+        <menu_item_call.on_click
+         function="Avatar.AddFriend" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableAddFriend" />
+    </menu_item_call>
     <menu_item_call
      label="IM"
      name="Send IM...">
         <menu_item_call.on_click
          function="Avatar.SendIM" />
     </menu_item_call>
+   <menu_item_separator />
+    <menu_item_call
+     enabled="false"
+     label="Block"
+     name="Avatar Mute">
+        <menu_item_call.on_click
+         function="Avatar.Mute" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableMute" />
+    </menu_item_call>
     <menu_item_call
-     label="About..."
-     name="About...">
-        <on_click
-         function="Avatar.ShowInspector" />
+     label="Report"
+     name="abuse">
+        <menu_item_call.on_click
+         function="Avatar.ReportAbuse" />
     </menu_item_call>
-	<menu_item_call
-	 label="Zoom In"
-	  name="Zoom In">
-	<menu_item_call.on_click
-	   function="Tools.LookAtSelection"
-	   parameter="zoom" />
+        <menu_item_call
+         label="Freeze"
+         name="Freeze...">
+            <menu_item_call.on_click
+             function="Avatar.Freeze" />
+            <menu_item_call.on_visible
+             function="Avatar.EnableFreezeEject"/>
+        </menu_item_call>
+        <menu_item_call
+         label="Eject"
+         name="Eject...">
+            <menu_item_call.on_click
+             function="Avatar.Eject" />
+            <menu_item_call.on_visible
+             function="Avatar.EnableFreezeEject"/>
+        </menu_item_call>
+        <menu_item_call
+         label="Debug Textures"
+         name="Debug...">
+            <menu_item_call.on_click
+             function="Avatar.Debug" />
+            <menu_item_call.on_visible
+             function="IsGodCustomerService"/>
+        </menu_item_call>
+	    <menu_item_call
+         label="Zoom In"
+          name="Zoom In">
+        <menu_item_call.on_click
+           function="Tools.LookAtSelection"
+           parameter="zoom" />
+    </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Pay"
+     name="Pay...">
+        <menu_item_call.on_click
+         function="PayObject" />
+        <menu_item_call.on_enable
+         function="EnablePayAvatar" />
     </menu_item_call>
-  <menu_item_call
-	enabled="false"
-	label="Touch"
-	name="Object Touch">
-	<on_click function="Object.Touch" />
-	<on_enable
-		function="Object.EnableTouch"
-		name="EnableTouch"
-		parameter="Touch" />
-	</menu_item_call>
+   <menu_item_separator />
+   <menu_item_call
+       label="Object Profile"
+       name="Object Inspect">
+         <menu_item_call.on_click
+          function="Object.Inspect" />
+         <menu_item_call.on_enable
+          function="Object.EnableInspect" />
+   </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From 7e3f9d3f836b8f161ecc63edcdfc21133e1a5c24 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 16:15:54 -0800
Subject: SOCIAL-554 FIX Allow right click of other avatars removed object
 profile option added back resize corner

---
 indra/newview/skins/minimal/xui/en/main_view.xml             | 7 +++++++
 indra/newview/skins/minimal/xui/en/menu_attachment_other.xml | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 5906205636..18fa332209 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -223,6 +223,13 @@
          name="popup_holder"
          class="popup_holder"
          width="1024">
+    <icon follows="right|bottom"
+      image_name="Resize_Corner"
+      right="-1"
+      name="resize_corner"
+      width="11"
+      bottom="-1"
+      height="11" />
   </panel>
   <view top="0"
         left="0"
diff --git a/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
index 58ad9214c0..9ed61b2317 100644
--- a/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
@@ -82,12 +82,4 @@
          function="EnablePayAvatar" />
     </menu_item_call>
    <menu_item_separator />
-   <menu_item_call
-       label="Object Profile"
-       name="Object Inspect">
-         <menu_item_call.on_click
-          function="Object.Inspect" />
-         <menu_item_call.on_enable
-          function="Object.EnableInspect" />
-   </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From c1dc36204dfa5cf9aeb0f80b7bf05658e280fcad Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 16:32:05 -0800
Subject: SOCIAL-549 FIX Enable teleport SOCIAL-553 FIX Allow teleport offers
 from other avatars

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index fc1810623d..72d34aba19 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -17,6 +17,8 @@
   <hide name="RegionEntryAccessBlocked_KB"/>
   <hide name="RegionTPAccessBlocked"/>
   <hide name="RegionEntryAccessBlocked"/>
+  <show name="TeleportOffered"/>
+  <show name="OfferTeleport"/>
   <show name="RegionRestartMinutes"/>
   <show name="RegionRestartSeconds"/>
   <show name="ConfirmQuit"/>
-- 
cgit v1.2.3


From c50d5267f8854de27afc6d2984c87a798ad2e0e2 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 16:36:51 -0800
Subject: SOCIAL-556 FIX Allow friend requests also re-enabled friend online
 notifications

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 72d34aba19..8757049482 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -22,6 +22,7 @@
   <show name="RegionRestartMinutes"/>
   <show name="RegionRestartSeconds"/>
   <show name="ConfirmQuit"/>
+  <show tag="friendship"/>
   <show tag="fail"/>
   <show tag="funds"/>
   <show type="hint"/>
-- 
cgit v1.2.3


From bc3ac58ec8324e41fa90c18a119571c01916242a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 16:57:57 -0800
Subject: SOCIAL-576 FIX User cannot launch external browser to view content of
 links on TOS when logging in as new user using Minimal Skin

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 8757049482..744cf94d18 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -19,6 +19,7 @@
   <hide name="RegionEntryAccessBlocked"/>
   <show name="TeleportOffered"/>
   <show name="OfferTeleport"/>
+  <show name="WebLaunchExternalTarget"/>
   <show name="RegionRestartMinutes"/>
   <show name="RegionRestartSeconds"/>
   <show name="ConfirmQuit"/>
-- 
cgit v1.2.3


From df41ad705ee5607a98f0b30e1eada3ff93f024c9 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 17:43:08 -0800
Subject: SOCIAL-602 FIX  Avatars button to My Avatar

---
 indra/newview/skins/minimal/xui/en/panel_bottomtray.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 4f696ccfe2..2caa8ad903 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -189,7 +189,7 @@
                            image_unselected="PushButton_Off"
                            scale_image="true"
                            font="SansSerifSmall"
-                           label="Avatars"
+                           label="My Avatar"
                            left="0"
                            height="23"
                            width="100"
-- 
cgit v1.2.3


From aff0cb567a35e063a6e15092de006b9393dcfbb0 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 17:43:44 -0800
Subject: SOCIAL-606 FIX  panel has unused UI items

---
 .../newview/skins/minimal/xui/en/panel_people.xml  | 550 +++++++++++++++++++++
 1 file changed, 550 insertions(+)
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_people.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_people.xml b/indra/newview/skins/minimal/xui/en/panel_people.xml
new file mode 100644
index 0000000000..bbc82f032d
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_people.xml
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Side tray panel -->
+<panel
+ default_tab_group="1"
+ follows="all"
+ height="449"
+ label="People"
+ layout="topleft"
+ left="0"
+ min_height="350"
+ name="people_panel"
+ top="0"
+ width="333">
+    <string
+     name="no_recent_people"
+     value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
+    <string
+     name="no_filtered_recent_people"
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." />
+    <string
+     name="no_one_near"
+     value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
+    <string
+     name="no_one_filtered_near"
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." />
+    <string
+     name="no_friends_online"
+     value="No friends online" />
+    <string
+     name="no_friends"
+     value="No friends" />
+    <string
+     name="no_friends_msg">
+         Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
+Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
+    </string>
+    <string
+     name="no_filtered_friends_msg">
+         Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
+    </string>
+    <string
+     name="people_filter_label"
+     value="Filter People" />
+    <string
+     name="groups_filter_label"
+     value="Filter Groups" />
+     <!--
+     *WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes.
+     They are not defined as translatable in VLT. See EXT-5931
+     -->
+    <string
+     name="no_filtered_groups_msg"
+     value="Didn't find what you're looking for? Try [secondlife:///app/search/groups/[SEARCH_TERM] Search]." />
+    <string
+     name="no_groups_msg"
+     value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]." />
+	<string
+	 name="MiniMapToolTipMsg"
+	 value="[REGION](Double-click to open Map, shift-drag to pan)"/>
+	<string
+	 name="AltMiniMapToolTipMsg"
+	 value="[REGION](Double-click to teleport, shift-drag to pan)"/>
+	<filter_editor
+     follows="left|top|right"
+     height="23"
+     layout="topleft"
+     left="10"
+     label="Filter"
+     max_length="300"
+     name="filter_input"
+     text_color="Black"
+     text_pad_left="10"
+     top="3"
+     width="303" />
+    <tab_container
+     follows="all"
+     height="383"
+     layout="topleft"
+     left="5"
+     name="tabs"
+     tab_group="1"
+     tab_min_width="70"
+     tab_height="30"
+     tab_position="top"
+     top_pad="10"
+     halign="center"
+     width="317">
+     	<panel
+         background_opaque="true"
+       background_visible="true"
+         bg_alpha_color="DkGray"
+         bg_opaque_color="DkGray"
+         follows="all"
+         height="383"
+         label="NEARBY"
+         layout="topleft"
+         left="0"
+         help_topic="people_nearby_tab"
+         name="nearby_panel"
+         top="0"
+         width="313">
+			<net_map
+			 bg_color="NetMapBackgroundColor"
+			 follows="top|left|right"
+			 layout="topleft"
+			 left="3"
+			 mouse_opaque="false"
+			 name="Net Map"
+			 width="307"
+			 height="140"
+			 top="0"/>
+			<avatar_list
+             allow_select="true"
+             follows="top|left|bottom|right"
+             height="216"
+             ignore_online_status="true"
+             layout="topleft"
+             left="3"
+             multi_select="true"
+             name="avatar_list"
+             top="145"
+             width="307" />
+            <panel
+             background_visible="true"
+             follows="left|right|bottom"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="3"
+             name="bottom_panel"
+             top_pad="0"
+             width="313">
+             <icon
+             follows="bottom|left|right"
+             height="25"
+             image_name="Toolbar_Right_Off"
+             layout="topleft"
+             left_pad="1"
+             name="dummy_icon"
+             width="241"
+             />
+            </panel>
+        </panel>
+        <panel
+         background_opaque="true"
+       background_visible="true"
+         bg_alpha_color="DkGray"
+         bg_opaque_color="DkGray"
+         follows="all"
+         height="383"
+         label="MY FRIENDS"
+         layout="topleft"
+         left="0"
+         help_topic="people_friends_tab"
+         name="friends_panel"
+         top="0"
+         width="313">
+            <accordion
+       		 background_visible="true"
+       		 bg_alpha_color="DkGray2"
+       		 bg_opaque_color="DkGray2"
+             follows="all"
+             height="356"
+             layout="topleft"
+             left="3"
+             name="friends_accordion"
+             top="0"
+             width="307">
+                <accordion_tab
+                 layout="topleft"
+                 height="172"
+                 min_height="150"
+                 name="tab_online"
+                 title="Online">
+                        <avatar_list
+                         allow_select="true"
+                         follows="all"
+                         height="172"
+                         layout="topleft"
+                         left="0"
+                         multi_select="true"
+                         name="avatars_online"
+                         show_permissions_granted="true"
+                         top="0"
+                         width="307" />
+                </accordion_tab>
+                <accordion_tab
+                 layout="topleft"
+                 height="173"
+                 name="tab_all"
+                 title="All">
+                        <avatar_list
+                         allow_select="true"
+                         follows="all"
+                         height="173"
+                         layout="topleft"
+                         left="0"
+                         multi_select="true"
+                         name="avatars_all"
+                         show_permissions_granted="true"
+                         top="0"
+                         width="307" />
+                </accordion_tab>
+            </accordion>
+            <panel
+             background_visible="true"
+             follows="left|right|bottom"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="3"
+             name="bottom_panel"
+             top_pad="0"
+             width="313">
+             
+             	  <layout_stack
+				   animate="false"
+				   border_size="0"
+				   follows="left|right|bottom"
+				   height="25"
+				   layout="topleft"
+				   orientation="horizontal"
+				   top_pad="1"
+				   left="0"
+				   name="bottom_panel"
+				   width="305">
+				      <layout_panel
+				       auto_resize="true"
+				       height="25"
+				       layout="topleft"
+				       name="dummy_panel"
+				       user_resize="false"
+				       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"
+				       user_resize="false"
+				       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="del_btn"
+				           tool_tip="Remove selected person from your Friends list"
+				           top="0"
+				           width="31"/>
+				      </layout_panel>
+				  </layout_stack><!--
+             
+               <button
+               follows="bottom|left"
+               tool_tip="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="friends_viewsort_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="Offer friendship to a Resident"
+                 width="31" />
+                <icon
+             	 follows="bottom|left|right"
+             	 height="25"
+             	 image_name="Toolbar_Middle_Off"
+             	 layout="topleft"
+             	 left_pad="1"
+             	 name="dummy_icon"
+             	 width="209"
+             />
+                <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"
+                 layout="topleft"
+                 left_pad="1"
+                 name="del_btn"
+                 tool_tip="Remove selected person from your Friends list"
+                 width="31" />
+            --></panel>
+            <text
+             follows="all"
+             height="450"
+             left="13"
+             name="no_friends_help_text"
+             top="10"
+             width="293"
+             wrap="true" />
+        </panel>
+        <panel
+         background_opaque="true"
+       background_visible="true"
+         bg_alpha_color="DkGray"
+         bg_opaque_color="DkGray"
+         follows="all"
+         height="383"
+         label="RECENT"
+         layout="topleft"
+         left="0"
+         help_topic="people_recent_tab"
+         name="recent_panel"
+         top="0"
+         width="313">
+            <avatar_list
+             allow_select="true"
+             follows="all"
+             height="356"
+             layout="topleft"
+             left="3"
+             multi_select="true"
+             name="avatar_list"
+             show_last_interaction_time="true"
+             top="0"
+             width="307" />
+            <panel
+             background_visible="true"
+             follows="left|right|bottom"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="bottom_panel"
+             top_pad="0"
+             width="313">
+              <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_friend_btn"
+                 tool_tip="Add selected Resident to your friends List"
+                 width="31">
+                <commit_callback
+                   function="People.addFriend" />
+              </button>
+              <icon
+             	 follows="bottom|left|right"
+             	 height="25"
+             	 image_name="Toolbar_Right_Off"
+             	 layout="topleft"
+             	 left_pad="1"
+             	 name="dummy_icon"
+             	 width="241"
+             />
+            </panel>
+        </panel>
+    </tab_container>
+    <panel
+     follows="bottom|left|right"
+     height="23"
+     layout="topleft"
+     left="8"
+     top_pad="4"
+     name="button_bar"
+     width="313">
+
+<!--********************************Profile; IM; Call, Share, Teleport********************************--> 	
+     	<layout_stack
+     	follows="bottom|left|right"
+		height="23"
+		layout="topleft"
+		name="bottom_bar_ls"
+		left="0"
+		orientation="horizontal"
+		top_pad="0"
+		width="313">
+
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left="0"
+			name="view_profile_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="68">
+				<button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Profile"
+		         layout="topleft"
+		         left="1"
+		         name="view_profile_btn"
+		         tool_tip="Show picture, groups, and other Residents information"
+		         top="0"
+		         width="67" />	
+			</layout_panel>
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			name="chat_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="41">
+				<button
+		         follows="bottom|left|right"
+		         left="1"
+		         height="23"
+		         label="IM"
+		         layout="topleft"
+		         name="im_btn"
+		         tool_tip="Open instant message session"
+		         top="0"
+		         width="40" />			
+			</layout_panel>
+		
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			name="chat_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="77">
+				<button
+		         follows="bottom|left|right"
+		         left="1"
+		         height="23"
+		         label="Teleport"
+		         layout="topleft"
+		         name="teleport_btn"
+		         tool_tip="Offer teleport"
+		         top="0"
+		         width="76" />		
+			</layout_panel>
+		</layout_stack>
+		
+<!--********************************Group Profile; Group Chat; Group Call buttons************************-->			
+		<layout_stack
+     	follows="bottom|left|right"
+		height="23"
+		layout="topleft"
+		mouse_opaque="false"
+		name="bottom_bar_ls1"
+		left="0"
+		orientation="horizontal"
+		top="0"
+		width="313">	
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left="0"			
+			mouse_opaque="false"
+			name="group_info_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="108">
+				<button
+		        follows="bottom|left|right"
+		        left="1"
+		        height="23"
+		        label="Group Profile"
+		        layout="topleft"
+				mouse_opaque="false"
+		        name="group_info_btn"
+		        tool_tip="Show group information"
+		        top="0"
+		        width="107" />		
+			</layout_panel>
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			mouse_opaque="false"
+			name="chat_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="101">
+				<button
+		        follows="bottom|left|right"
+		        left="1"
+		        height="23"
+		        label="Group Chat"
+		        layout="topleft"
+				mouse_opaque="false"
+		        name="chat_btn"
+		        tool_tip="Open chat session"
+		        top="0"
+		        width="100" />			
+			</layout_panel>
+		
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			mouse_opaque="false"
+			name="group_call_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="96">
+				<button
+				follows="bottom|left|right"
+				left="1"
+				height="23"
+         		label="Group Call"
+         		layout="topleft"
+				mouse_opaque="false"
+         		name="group_call_btn"
+         		tool_tip="Call this group"
+		        top="0"
+         		width="95" />			
+			</layout_panel>		
+		</layout_stack>
+    </panel>
+</panel>
-- 
cgit v1.2.3


From 2e8e93eb2582096412db4185c52c7ae63b8facac Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 17:45:05 -0800
Subject: reverted customization of web content floater so show in external
 browser is visible again

---
 .../skins/minimal/xui/en/floater_web_content.xml   | 172 ---------------------
 1 file changed, 172 deletions(-)
 delete mode 100644 indra/newview/skins/minimal/xui/en/floater_web_content.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/floater_web_content.xml b/indra/newview/skins/minimal/xui/en/floater_web_content.xml
deleted file mode 100644
index 4a13339ee4..0000000000
--- a/indra/newview/skins/minimal/xui/en/floater_web_content.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-  legacy_header_height="18"
-  can_resize="true"
-  height="775"
-  layout="topleft"
-  min_height="400"
-  min_width="500"
-  name="floater_web_content"
-  help_topic="floater_web_content"
-  save_rect="true"
-  auto_tile="true"
-  title=""
-  initial_mime_type="text/html"
-  width="780">
-  <layout_stack
-    bottom="775"
-    follows="left|right|top|bottom"
-    layout="topleft"
-    left="5"
-    name="stack1"
-    orientation="vertical"
-    top="20"
-    width="770">
-    <layout_panel
-      auto_resize="false"
-      default_tab_group="1"
-      height="22"
-      layout="topleft"
-      left="0"
-      min_height="20"
-      name="nav_controls"
-      top="400"
-      user_resize="false"
-      width="770">
-      <button
-        image_overlay="Arrow_Left_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
-		    hover_glow_amount="0.15"
-        tool_tip="Navigate back"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="1"
-        name="back"
-        top="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.Back" />
-      </button>
-      <button
-        image_overlay="Arrow_Right_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
-        tool_tip="Navigate forward"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="27"
-        name="forward"
-        top_delta="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.Forward" />
-      </button>
-      <button
-        image_overlay="Stop_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
-        tool_tip="Stop navigation"
-        enabled="true"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="51"
-        name="stop"
-        top_delta="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.Stop" />
-      </button>
-      <button
-        image_overlay="Refresh_Off"
-		    image_disabled="PushButton_Disabled"
-		    image_disabled_selected="PushButton_Disabled"
-		    image_selected="PushButton_Selected"
-		    image_unselected="PushButton_Off"
-        tool_tip="Reload page"
-        follows="left|top"
-        height="22"
-        layout="topleft"
-        left="51"
-        name="reload"
-        top_delta="0"
-        width="22">
-        <button.commit_callback
-          function="WebContent.Reload" />
-      </button>
-      <combo_box
-        allow_text_entry="true"
-        follows="left|top|right"
-        tab_group="1"
-        height="22"
-        layout="topleft"
-        left_pad="4"
-        max_chars="1024"
-        name="address"
-        combo_editor.select_on_focus="true"
-        tool_tip="Enter URL here"
-        top_delta="0"
-        width="672">
-        <combo_box.commit_callback
-          function="WebContent.EnterAddress" />
-      </combo_box>
-      <icon
-        name="media_secure_lock_flag"
-        height="16"
-        follows="top|right"
-        image_name="Lock2"
-        layout="topleft"
-        left_delta="620"
-        top_delta="2"
-        visible="false" 
-        tool_tip="Secured Browsing"
-        width="16" />
-    </layout_panel>
-    <layout_panel
-      height="40"
-      layout="topleft"
-      left_delta="0"
-      name="external_controls"
-      top_delta="0"
-      user_resize="false"
-      width="585">
-      <web_browser
-        bottom="-22"
-        follows="all"
-        layout="topleft"
-        left="0"
-        name="webbrowser"
-        top="0"/>
-      <text
-        type="string"
-        length="200"
-        follows="bottom|left"
-        height="20"
-        layout="topleft"
-        left_delta="0"
-        name="statusbartext"
-        parse_urls="false"
-        text_color="0.4 0.4 0.4 1"
-        top_pad="5"
-        width="495"/>
-      <progress_bar
-        color_bar="0.3 1.0 0.3 1"
-        follows="bottom|right"
-        height="16"
-        top_delta="-1"
-        left_pad="24"
-        layout="topleft"
-        name="statusbarprogress"
-        width="64"/>
-    </layout_panel>
-  </layout_stack>
-</floater>
-- 
cgit v1.2.3


From 78d3fb317941dc04a3398e4c079083ada967567d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 17:47:19 -0800
Subject: SOCIAL-607 FIX  People Panel is open and there is nobody nearby a
 message is displayed which directs users toward Search and World Map

---
 indra/newview/skins/minimal/xui/en/panel_people.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_people.xml b/indra/newview/skins/minimal/xui/en/panel_people.xml
index bbc82f032d..9c19e445fe 100644
--- a/indra/newview/skins/minimal/xui/en/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_people.xml
@@ -13,16 +13,16 @@
  width="333">
     <string
      name="no_recent_people"
-     value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
+     value="No recent people. Looking for people to hang out with? Try the Destinations button below." />
     <string
      name="no_filtered_recent_people"
-     value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." />
+     value="Didn't find what you're looking for? Try the Destinations button below." />
     <string
      name="no_one_near"
-     value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
+     value="No one nearby. Looking for people to hang out with? Try the Destinations button below." />
     <string
      name="no_one_filtered_near"
-     value="Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]." />
+     value="Didn't find what you're looking for? Try the Destinations button below." />
     <string
      name="no_friends_online"
      value="No friends online" />
-- 
cgit v1.2.3


From b68f02fa5433eb5d3dff6edc8941e9fb527678e7 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 17:50:49 -0800
Subject: SOCIAL-607 FIX  People Panel is open and there is nobody nearby a
 message is displayed which directs users toward Search and World Map

---
 indra/newview/skins/minimal/xui/en/panel_people.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_people.xml b/indra/newview/skins/minimal/xui/en/panel_people.xml
index 9c19e445fe..4a72653d76 100644
--- a/indra/newview/skins/minimal/xui/en/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_people.xml
@@ -16,13 +16,13 @@
      value="No recent people. Looking for people to hang out with? Try the Destinations button below." />
     <string
      name="no_filtered_recent_people"
-     value="Didn't find what you're looking for? Try the Destinations button below." />
+     value="No recent people with that name." />
     <string
      name="no_one_near"
      value="No one nearby. Looking for people to hang out with? Try the Destinations button below." />
     <string
      name="no_one_filtered_near"
-     value="Didn't find what you're looking for? Try the Destinations button below." />
+     value="No one nearby with that name." />
     <string
      name="no_friends_online"
      value="No friends online" />
@@ -31,12 +31,12 @@
      value="No friends" />
     <string
      name="no_friends_msg">
-         Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
-Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
+         Right-click on a Resident to add them as a friend.
+Looking for people to hang out with? Try the Destinations button below.
     </string>
     <string
      name="no_filtered_friends_msg">
-         Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
+      Didn't find what you're looking for? Try the Destinations button below..
     </string>
     <string
      name="people_filter_label"
-- 
cgit v1.2.3


From f23a2ae92fddea845171f7b8597271d988105198 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 1 Mar 2011 11:21:52 -0800
Subject: SOCIAL-611 FIX Freeze and Eject do not work in minimal skin from
 avatar context me

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 744cf94d18..ed2174746f 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -18,11 +18,9 @@
   <hide name="RegionTPAccessBlocked"/>
   <hide name="RegionEntryAccessBlocked"/>
   <show name="TeleportOffered"/>
-  <show name="OfferTeleport"/>
-  <show name="WebLaunchExternalTarget"/>
   <show name="RegionRestartMinutes"/>
   <show name="RegionRestartSeconds"/>
-  <show name="ConfirmQuit"/>
+  <show tag="confirm"/>
   <show tag="friendship"/>
   <show tag="fail"/>
   <show tag="funds"/>
-- 
cgit v1.2.3


From ac2a1aa5b017c098c98745988fcd77a243ef6552 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 1 Mar 2011 11:33:14 -0800
Subject: SOCIAL-554 FIX Allow right click of other avatars

---
 indra/newview/skins/minimal/xui/en/menu_attachment_other.xml | 9 ---------
 1 file changed, 9 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
index 9ed61b2317..b55e677276 100644
--- a/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_attachment_other.xml
@@ -72,14 +72,5 @@
            function="Tools.LookAtSelection"
            parameter="zoom" />
     </menu_item_call>
-   <menu_item_call
-     enabled="false"
-     label="Pay"
-     name="Pay...">
-        <menu_item_call.on_click
-         function="PayObject" />
-        <menu_item_call.on_enable
-         function="EnablePayAvatar" />
-    </menu_item_call>
    <menu_item_separator />
 </context_menu>
-- 
cgit v1.2.3


From 4ae59ae6b7da34c25bb9adb39f48a5e2a9f0d327 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 1 Mar 2011 11:44:02 -0800
Subject: SOCIAL-584 FIX User name field not shown in mini-inspector in minimal
 skin

---
 .../skins/minimal/xui/en/inspect_avatar.xml        | 42 +++++++++++++++++-----
 1 file changed, 33 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
index efc31e5d43..517d0e647a 100644
--- a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
@@ -9,13 +9,13 @@
  bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="148"
+ height="164"
  layout="topleft"
  name="inspect_avatar"
  single_instance="true"
  sound_flags="0"
  visible="true"
- width="228">
+ width="245">
   <!-- Allowed fields include:
 	[BORN_ON] ("12/3/2008")
 	[SL_PROFILE] (Second Life profile),
@@ -34,15 +34,38 @@
     </string>
   <text
      follows="top|left"
-     font="SansSerifLarge"
-     height="16"
+     font="SansSerif"
+     height="20"
+     left="8"
+     name="user_name_small"
+     top="7"
+     text_color="White"
+     use_ellipses="true"
+     word_wrap="true"
+    visible="false" 
+     value="Grumpity ProductEngine with a long name"
+     width="185" />
+   <text
+    follows="top|left"
+    font="SansSerifBigLarge"
+    height="21"
      left="8"
      name="user_name"
      top="10"
      text_color="White"
      use_ellipses="true"
      value="Grumpity ProductEngine"
-     width="175" />
+     width="190" />
+   <text
+     follows="top|left"
+     height="16"
+     left="8"
+     name="user_slid"
+     font="SansSerifSmallBold"
+     text_color="EmphasisColor"
+     value="james.linden"
+     width="185"
+     use_ellipses="true" />
     <text
      follows="top|left"
      height="16"
@@ -50,6 +73,7 @@
      name="user_subtitle"
      font="SansSerifSmall"
      text_color="White"
+     top_pad="0" 
      value="11 Months, 3 days old"
      width="175"
      use_ellipses="true" />
@@ -60,9 +84,9 @@
      name="user_details"
      right="-10"
      word_wrap="true"
-     top_pad="6"
+     top_pad="4"
      use_ellipses="true"
-     width="220">This is my second life description and I really think it is great.
+     width="220">This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot
     </text>
     <slider
      follows="top|left"
@@ -76,7 +100,7 @@
      tool_tip="Voice volume"
      top_pad="0"
      value="0.5"
-     width="195" />
+     width="200" />
     <button
      follows="top|left"
      height="16"
@@ -105,7 +129,7 @@
 -->
   <panel 
     follows="top|left" 
-    top="148" 
+    top="164" 
     left="0" 
     height="60" 
     width="228" 
-- 
cgit v1.2.3


From fd789c5ba41bfc34289cd58013681c4d2bc421de Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 1 Mar 2011 12:34:46 -0800
Subject: SOCIAL-614 FIX Notifications that prompt user to launch
 secondlife.com are not shown in minimal skin

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index ed2174746f..f4e10cf97d 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -10,14 +10,8 @@
   <hide name="HintLindenDollar"/>
   <hide name="HintMove"/>
   <hide name="ClothingLoading"/>
-  <hide name="NotAgeVerified"/>
-  <hide name="RegionEntryAccessBlocked_Change"/>
   <hide name="LandBuyPass"/>
-  <hide name="LoginPacketNeverReceived"/>
-  <hide name="RegionEntryAccessBlocked_KB"/>
-  <hide name="RegionTPAccessBlocked"/>
-  <hide name="RegionEntryAccessBlocked"/>
-  <show name="TeleportOffered"/>
+  <hide tag="voice"/>
   <show name="RegionRestartMinutes"/>
   <show name="RegionRestartSeconds"/>
   <show tag="confirm"/>
-- 
cgit v1.2.3


From bf3f474b0ef1221288cb65c24332f010873f943a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 1 Mar 2011 12:37:39 -0800
Subject: SOCIAL-613 FIX Viewer can log out and stay open with no notification
 to user in minimal skin

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index f4e10cf97d..aed8f5f6f8 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -21,6 +21,7 @@
   <show type="hint"/>
   <show type="notifytoast"/>
   <show name="ModeChange"/>
+  <show name-="YouHaveBeenLoggedOut"/>
   <hide/>
 </notification_visibility>
 
-- 
cgit v1.2.3


From 36dc25b78b51fff11746dd3a2b1ac33f801475c1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 1 Mar 2011 12:37:47 -0800
Subject: SOCIAL-613 FIX Viewer can log out and stay open with no notification
 to user in minimal skin

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index aed8f5f6f8..e866ca3df5 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -21,7 +21,7 @@
   <show type="hint"/>
   <show type="notifytoast"/>
   <show name="ModeChange"/>
-  <show name-="YouHaveBeenLoggedOut"/>
+  <show name="YouHaveBeenLoggedOut"/>
   <hide/>
 </notification_visibility>
 
-- 
cgit v1.2.3


From 876ac01791104afa9122ea0d3f6a914b5a86fd72 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 1 Mar 2011 15:56:34 -0800
Subject: reverted inspectors to viewer 2 defaults

---
 .../skins/minimal/xui/en/inspect_avatar.xml        | 61 +++++++++++++++--
 .../skins/minimal/xui/en/inspect_object.xml        | 76 ++++++++++++++++++----
 2 files changed, 119 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
index 517d0e647a..853d5f8735 100644
--- a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml
@@ -49,13 +49,13 @@
     follows="top|left"
     font="SansSerifBigLarge"
     height="21"
-     left="8"
-     name="user_name"
-     top="10"
-     text_color="White"
-     use_ellipses="true"
-     value="Grumpity ProductEngine"
-     width="190" />
+    left="8"
+    name="user_name"
+    top="10"
+    text_color="White"
+    use_ellipses="true"
+    value="Grumpity ProductEngine"
+    width="190" />
    <text
      follows="top|left"
      height="16"
@@ -127,6 +127,53 @@
 <!-- Overlapping buttons for default actions
     llinspectavatar.cpp makes visible the most likely default action 
 -->
+    <button
+     follows="top|left"
+     height="20"
+     label="Add Friend"
+     left="8"
+     top="135"
+     name="add_friend_btn"
+     width="90" />
+    <button
+     follows="top|left"
+     height="20"
+     label="IM"
+     left_delta="0"
+     top_delta="0"
+     name="im_btn"
+     width="80"
+     commit_callback.function="InspectAvatar.IM"/>
+	<button
+     follows="top|left"
+     height="20"
+     label="Profile"
+     layout="topleft"
+     name="view_profile_btn"
+     left_delta="96"
+     top_delta="0"
+     tab_stop="false"
+     width="80" />
+      <!--  gear buttons here -->
+  <menu_button
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     image_overlay="OptionsMenu_Off"
+     menu_filename="menu_inspect_avatar_gear.xml"
+     name="gear_btn"
+     right="-5"
+     top_delta="0"
+     width="35" />
+	<menu_button
+     follows="top|left"
+     height="20"
+     image_overlay="OptionsMenu_Off"
+     menu_filename="menu_inspect_self_gear.xml"
+     name="gear_self_btn"
+     right="-5"
+     top_delta="0"
+     width="35" />
   <panel 
     follows="top|left" 
     top="164" 
diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml
index 32859690b7..8d14c974b4 100644
--- a/indra/newview/skins/minimal/xui/en/inspect_object.xml
+++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml
@@ -76,17 +76,52 @@ L$30,000
   </text>
   <!-- Overlapping buttons for all default actions.  Show "Buy" if
   for sale, "Sit" if can sit, etc. -->
+  <icon
+   name="secure_browsing"
+   image_name="Lock"
+   left="0"
+   visible="false"
+   width="18"
+   height="18"
+   top="103"
+   tool_tip="Secure Browsing"
+   follows="left|top" />
    <text
    follows="all"
    font="SansSerifSmall"
    height="13"
    name="object_media_url"
-   width="220"
-   top_pad="0"
+   width="207"
+   left_pad="2"
+   top_delta="0"
    max_length = "50"
    use_ellipses="true">
    http://www.superdupertest.com
 </text>
+  <button
+   follows="top|left"
+   height="20"
+   label="Buy"
+   left="8"
+   name="buy_btn"
+   top="121"
+   width="80" />
+  <button
+   follows="top|left"
+   height="20"
+   label="Pay"
+   left_delta="0"
+   name="pay_btn"
+   top_delta="0"
+   width="80" />
+  <button
+   follows="top|left"
+   height="20"
+   label="Take Copy"
+   left_delta="0"
+   name="take_free_copy_btn"
+   top_delta="0"
+   width="80" />
   <button
    follows="top|left"
    height="20"
@@ -103,14 +138,33 @@ L$30,000
    name="sit_btn"
    top_delta="0"
    width="80" />
-  <icon
-   name="secure_browsing"
-   image_name="Lock"
-   left_delta="80"
-   visible="false"
-   width="18"
-   height="18"
+  <button
+   follows="top|left"
+   height="20"
+   label="Open"
+   left_delta="0"
+   name="open_btn"
    top_delta="0"
-   tool_tip="Secure Browsing"
-   follows="left|top" />
+   width="80" />
+
+ <!--  non-overlapping buttons here -->
+     <button
+     follows="top|left"
+     height="20"
+     label="More"
+     layout="topleft"
+     name="more_info_btn"
+     left_pad="10"
+     top_delta="0"
+     tab_stop="false"
+     width="80" />
+         <menu_button
+     follows="top|left"
+     height="20"
+     image_overlay="OptionsMenu_Off"
+     menu_filename="menu_inspect_object_gear.xml"
+     name="gear_btn"
+     right="-5"
+     top_delta="0"
+     width="35" />
 </floater>
-- 
cgit v1.2.3


From 2eb58060b631381c960955cb6833d3111ecb9651 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 2 Mar 2011 19:39:43 -0800
Subject: SOCIAL-594 FIX Edit partner link, Twitter, and Facebook links do not
 work in web profile in minimal skin because they are popups and that
 notification is blocked

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index e866ca3df5..ee6a9f0b02 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -14,6 +14,7 @@
   <hide tag="voice"/>
   <show name="RegionRestartMinutes"/>
   <show name="RegionRestartSeconds"/>
+  <show name="PopupAttempt"/>
   <show tag="confirm"/>
   <show tag="friendship"/>
   <show tag="fail"/>
-- 
cgit v1.2.3


From c557692aa74ff33e9106da0816d47bb84885ae48 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 2 Mar 2011 20:30:38 -0800
Subject: SOCIAL-627 FIX Open in my Web browser, Always open in my web browser,
 and Close options are missing from Media browser in minimal skin

---
 .../skins/minimal/xui/en/floater_media_browser.xml | 205 ---------------------
 1 file changed, 205 deletions(-)
 delete mode 100644 indra/newview/skins/minimal/xui/en/floater_media_browser.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/floater_media_browser.xml b/indra/newview/skins/minimal/xui/en/floater_media_browser.xml
deleted file mode 100644
index 5ea33f0a8f..0000000000
--- a/indra/newview/skins/minimal/xui/en/floater_media_browser.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- height="440"
- layout="topleft"
- min_height="140"
- min_width="467"
- name="floater_about"
- save_rect="true"
- auto_tile="true"
- title="MEDIA BROWSER"
- width="820">
-    <floater.string
-     name="home_page_url">
-        http://www.secondlife.com
-    </floater.string>
-    <floater.string
-     name="support_page_url">
-        http://support.secondlife.com
-    </floater.string>
-    <layout_stack
-     bottom="440"
-     follows="left|right|top|bottom"
-     layout="topleft"
-     left="10"
-     name="stack1"
-     orientation="vertical" 
-     top="20"
-     width="800">
-        <layout_panel
-         auto_resize="false"
-         default_tab_group="1" 
-         height="20"
-         layout="topleft"
-         left="0"
-         name="nav_controls"
-         top="400"
-         user_resize="false"
-         width="800">
-            <button
-             follows="left|top"
-             height="20"
-             label="Back"
-             layout="topleft"
-             left="0"
-             name="back"
-             top="0"
-             width="55">
-				<button.commit_callback
-				function="MediaBrowser.Back" />
-			</button>
-            <button
-             follows="left|top"
-             height="20"
-             label="Forward"
-             layout="topleft"
-             left_pad="3"
-             name="forward"
-             top_delta="0"
-             width="68">
-				<button.commit_callback
-				function="MediaBrowser.Forward" />
-			</button>
-            <button
-             enabled="false"
-             follows="left|top"
-             height="20"
-             label="Reload"
-             layout="topleft"
-             left_pad="2"
-             name="reload"
-             top_delta="0"
-             width="70">
-				<button.commit_callback
-				function="MediaBrowser.Refresh" />
-			</button>
-            <combo_box
-             allow_text_entry="true"
-             follows="left|top|right"
-             tab_group="1"
-             height="20"
-             layout="topleft"
-             left_pad="5"
-             max_chars="1024"
-             name="address"
-             combo_editor.select_on_focus="true"
-             top_delta="0"
-             width="540">
-				<combo_box.commit_callback
-				function="MediaBrowser.EnterAddress" />
-			</combo_box>
-            <button
-             enabled="false"
-             follows="right|top"
-             height="20"
-             label="Go"
-             layout="topleft"
-             left_pad="5"
-             name="go"
-             top_delta="0"
-             width="55">
-				<button.commit_callback
-				function="MediaBrowser.Go" />
-			</button>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         height="20"
-         layout="topleft"
-         left_delta="0"
-         name="time_controls"
-         top_delta="0"
-         user_resize="false"
-         width="800">
-            <button
-             follows="left|top"
-             height="20"
-             label="rewind"
-             layout="topleft"
-             left="0"
-             name="rewind"
-             top="0"
-             width="55" />
-            <button
-             follows="left|top"
-             height="20"
-             image_selected="button_anim_play_selected.tga"
-             image_unselected="button_anim_play.tga"
-             layout="topleft"
-             left_delta="55"
-             name="play"
-             top_delta="0"
-             width="55" />
-            <button
-             follows="left|top"
-             height="20"
-             image_selected="button_anim_pause_selected.tga"
-             image_unselected="button_anim_pause.tga"
-             layout="topleft"
-             left_delta="0"
-             name="pause"
-             top_delta="0"
-             width="55" />
-            <button
-             follows="left|top"
-             height="20"
-             label="stop"
-             layout="topleft"
-             left_pad="10"
-             name="stop"
-             top_delta="0"
-             width="55" />
-            <button
-             follows="left|top"
-             height="20"
-             label="forward"
-             layout="topleft"
-             left_pad="20"
-             name="seek"
-             top_delta="0"
-             width="55" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         height="20"
-         layout="topleft"
-         left_delta="0"
-         name="parcel_owner_controls"
-         top_delta="0"
-         user_resize="false"
-         width="540">
-            <button
-             enabled="false"
-             follows="left|top"
-             height="20"
-             label="Send Current Page to Parcel"
-             layout="topleft"
-             left="0"
-             name="assign"
-             top="0"
-             width="200">
-				<button.commit_callback
-				function="MediaBrowser.Assign" />
-			</button>
-        </layout_panel>
-        <layout_panel
-         height="40"
-         layout="topleft"
-         left_delta="0"
-         name="external_controls"
-         top_delta="0"
-         user_resize="false"
-         width="540">
-          <web_browser
-             bottom="-10"
-             follows="all"
-             layout="topleft"
-             left="0"
-             name="browser"
-             top="0"
-             width="540" />
-        </layout_panel>
-    </layout_stack>
-</floater>
-- 
cgit v1.2.3


From 92403b4ea1c02d378a1157e8912f1e3976ba3772 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 2 Mar 2011 21:05:03 -0800
Subject: SOCIAL-593 FIX Profile Window cannot be resized in minimal skin
 floater view snapping rectangle is now driven by floater_snap_region view

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 18fa332209..a2c16fc9e2 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -71,6 +71,13 @@
                           user_resize="false" 
                           name="hud container"
                           width="500">
+              <view top="0"
+                    follows="all"
+                    height="500"
+                    left="0"
+                    mouse_opaque="false"
+                    name="floater_snap_region"
+                    width="500"/>
               <panel follows="left|top"
                      height="0"
                      left="0"
-- 
cgit v1.2.3


From 10a572da887ee599d6c4207cda3a106c7fc3aa65 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 3 Mar 2011 21:11:59 -0800
Subject: removed items from inspector menus that don't apply in minimal skin

---
 .../skins/minimal/xui/en/inspect_object.xml        |  12 +--
 .../minimal/xui/en/menu_inspect_avatar_gear.xml    | 118 ++++++++++++++++++++-
 .../minimal/xui/en/menu_inspect_object_gear.xml    | 116 +++++++++++++++++++-
 3 files changed, 231 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml
index 8d14c974b4..a5b03a2f58 100644
--- a/indra/newview/skins/minimal/xui/en/inspect_object.xml
+++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml
@@ -148,17 +148,7 @@ L$30,000
    width="80" />
 
  <!--  non-overlapping buttons here -->
-     <button
-     follows="top|left"
-     height="20"
-     label="More"
-     layout="topleft"
-     name="more_info_btn"
-     left_pad="10"
-     top_delta="0"
-     tab_stop="false"
-     width="80" />
-         <menu_button
+  <menu_button
      follows="top|left"
      height="20"
      image_overlay="OptionsMenu_Off"
diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml
index 28c4762eaa..5a4a059781 100644
--- a/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml
@@ -1,2 +1,116 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu/>
+<?xml version="1.0" encoding="utf-8"?>
+<toggleable_menu
+         create_jump_keys="true"
+         layout="topleft"
+         mouse_opaque="false"
+         visible="false"
+         name="Gear Menu">
+  <menu_item_call
+   label="View Profile"
+   enabled="true" 
+   name="view_profile">
+    <menu_item_call.on_click
+     function="InspectAvatar.ViewProfile"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Add Friend"
+   name="add_friend">
+    <menu_item_call.on_click
+     function="InspectAvatar.AddFriend"/>
+    <menu_item_call.on_enable
+     function="InspectAvatar.Gear.Enable"/>
+  </menu_item_call>
+  <menu_item_call
+   label="IM"
+   name="im">
+    <menu_item_call.on_click
+     function="InspectAvatar.IM"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Teleport"
+   name="teleport">
+    <menu_item_call.on_click
+     function="InspectAvatar.Teleport"/>
+    <menu_item_call.on_enable
+     function="InspectAvatar.Gear.EnableTeleportOffer"/>
+  </menu_item_call>
+  <menu_item_separator />
+  <menu_item_call
+   label="Block"
+   name="block">
+    <menu_item_call.on_click
+     function="InspectAvatar.ToggleMute"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.EnableMute" />
+  </menu_item_call>
+  <menu_item_call
+   label="Unblock"
+   name="unblock">
+    <menu_item_call.on_click
+     function="InspectAvatar.ToggleMute"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.EnableUnmute" />
+  </menu_item_call>
+  <menu_item_call
+   label="Report"
+   name="report">
+    <menu_item_call.on_click
+     function="InspectAvatar.Report"/>
+  </menu_item_call>  
+  <menu_item_call
+   label="Freeze"
+   name="freeze">
+    <menu_item_call.on_click
+     function="InspectAvatar.Freeze"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.VisibleFreeze"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Eject"
+   name="eject">
+    <menu_item_call.on_click
+     function="InspectAvatar.Eject"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.VisibleEject"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Kick"
+   name="kick">
+    <menu_item_call.on_click
+     function="InspectAvatar.Kick"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.EnableGod"/>
+  </menu_item_call>
+  <menu_item_call
+  label="CSR"
+  name="csr">
+    <menu_item_call.on_click
+     function="InspectAvatar.CSR" />
+    <menu_item_call.on_visible
+     function="InspectAvatar.EnableGod" />
+  </menu_item_call>
+  <menu_item_call
+   label="Debug Textures"
+   name="debug">
+    <menu_item_call.on_click
+     function="Avatar.Debug"/>
+    <menu_item_call.on_visible
+     function="IsGodCustomerService"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Find On Map"
+   name="find_on_map">
+    <menu_item_call.on_click
+     function="InspectAvatar.FindOnMap"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.VisibleFindOnMap"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Zoom In"
+   name="zoom_in">
+    <menu_item_call.on_click
+     function="InspectAvatar.ZoomIn"/>
+    <menu_item_call.on_visible
+     function="InspectAvatar.VisibleZoomIn"/>
+  </menu_item_call>  
+</toggleable_menu>
diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml
index 28c4762eaa..6a1b1d8fc7 100644
--- a/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml
@@ -1,2 +1,114 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu/>
+<?xml version="1.0" encoding="utf-8"?>
+<toggleable_menu
+   create_jump_keys="true"
+   layout="topleft"
+   mouse_opaque="false"
+   visible="false"
+   name="Gear Menu">
+  <menu_item_call
+   label="Touch"
+   layout="topleft"
+   enabled="true"
+   name="touch">    
+    <menu_item_call.on_click
+     function="InspectObject.Touch"/>
+    <menu_item_call.on_visible
+     function="Object.EnableTouch" />
+  </menu_item_call>
+  <menu_item_call
+  label="Sit"
+  layout="topleft"
+  name="sit">
+    <menu_item_call.on_click
+     function="InspectObject.Sit"/>
+    <menu_item_call.on_visible
+     function="Object.EnableSit"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Pay"
+   layout="topleft"
+   name="pay">
+    <menu_item_call.on_click
+     function="InspectObject.Pay"/>
+    <menu_item_call.on_visible
+     function="EnablePayObject" />
+  </menu_item_call>
+  <menu_item_call
+   label="Buy"
+   layout="topleft"
+   enabled="true" 
+   name="buy">
+    <menu_item_call.on_click
+     function="InspectObject.Buy"/>
+    <menu_item_call.on_visible
+     function="Object.VisibleBuy" />
+  </menu_item_call>
+  <menu_item_call
+   label="Take Copy"
+   layout="topleft"
+   name="take_copy">
+    <menu_item_call.on_click
+     function="InspectObject.TakeFreeCopy"/>
+    <menu_item_call.on_visible
+      function="Tools.EnableTakeCopy"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Open"
+   layout="topleft"
+   name="open">
+    <menu_item_call.on_click
+     function="InspectObject.Open"/>
+    <menu_item_call.on_visible
+     function="Object.EnableOpen" />
+  </menu_item_call>
+  <menu_item_call
+   label="Wear"
+   layout="topleft"
+   name="wear">
+    <menu_item_call.on_click
+     function="Object.AttachToAvatar" />
+    <menu_item_call.on_visible
+     function="Object.EnableWear" />
+  </menu_item_call>  
+  <menu_item_call
+   label="Add"
+   layout="topleft"
+   name="add">
+    <menu_item_call.on_click
+     function="Object.AttachAddToAvatar" />
+    <menu_item_call.on_visible
+     function="Object.EnableWear" />
+  </menu_item_call>
+  <menu_item_call
+   label="Report"
+   layout="topleft"
+   name="report">
+    <menu_item_call.on_click
+     function="Object.ReportAbuse" />
+  </menu_item_call>
+  <menu_item_call
+   label="Block"
+   layout="topleft"
+   name="block">
+    <menu_item_call.on_click
+     function="Object.Mute" />
+    <menu_item_call.on_visible
+     function="Object.EnableMute" />
+  </menu_item_call>
+  <menu_item_call
+    label="Zoom In"
+    layout="topleft"
+   name="zoom_in">
+    <menu_item_call.on_click
+     function="InspectObject.ZoomIn" />
+  </menu_item_call>    
+  <menu_item_call
+   label="Remove"
+   layout="topleft"
+   name="remove">
+      <menu_item_call.on_click
+       function="Object.Delete" />
+      <menu_item_call.on_visible
+       function="Object.EnableDelete" />
+  </menu_item_call>
+</toggleable_menu>
-- 
cgit v1.2.3


From 25ad57c4b6db3793a0bb6fc1901ea6b0e969c17f Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 4 Mar 2011 00:40:38 -0800
Subject: SOCIAL-603 FIX Move how to button to bottom bar moves scrollbar up
 from bottom of screen to leave room for resize thumb

---
 indra/newview/skins/minimal/xui/en/main_view.xml   |  4 +--
 .../skins/minimal/xui/en/panel_bottomtray.xml      | 35 +++++++++++++++++++++-
 .../skins/minimal/xui/en/panel_navigation_bar.xml  | 14 +--------
 3 files changed, 37 insertions(+), 16 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index a2c16fc9e2..1cc02006f2 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -131,13 +131,13 @@
                    name="bottom_tray_container"
                    visible="false"/>
             <layout_panel auto_resize="false"
-                          height="200"
+                          height="215"
                           mouse_opaque="false"
                           user_resize="false"
                           name="avatar_picker_and_destination_guide_container"
                           visible="false">
               <panel top="0"
-                     height="200"
+                     height="215"
                      left="0"
                      background_visible="true" 
                      width="500"
diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 2caa8ad903..ccecdd9ece 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -281,7 +281,40 @@
               parameter="agent"/>
           </bottomtray_button>
         </layout_panel>
-        <layout_panel
+      <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="65"
+         mouse_opaque="false"
+         name="howto_panel"
+         top_delta="0"
+         user_resize="false"
+         width="105">
+        <bottomtray_button
+           can_drag="false"
+          follows="left|right"
+          height="23"
+          image_pressed="PushButton_Press"
+          image_pressed_selected="PushButton_Selected_Press"
+          image_selected="PushButton_Selected_Press"
+          label="How To"
+          layout="topleft"
+          left="0"
+          name="show_help_btn"
+          tool_tip="Open Second Life How To topics"
+          is_toggle="true"
+          top="5"
+          use_ellipses="true"
+          width="100">
+          <bottomtray_button.commit_callback
+            function="ToggleHelp"
+            parameter="f1_help" />
+          </bottomtray_button>
+      </layout_panel>
+      <layout_panel
          follows="left|right"
          height="30"
          layout="topleft"
diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index cd21242edc..6dc1a1c9b0 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -63,7 +63,7 @@ width="31" />
      mouse_opaque="false"
      name="location_combo"
      top_delta="0"
-     width="360">
+     width="440">
     </location_input>
     <icon follows="right"
           height="20"
@@ -72,17 +72,5 @@ width="31" />
           image_name="Button_Separator"
           name="separator"
           top="2"/>
-    <button
-      right="-70"
-      top="2"
-      width="80"
-      height="22"
-      label="How To"
-      follows="top|right"
-      name="skylight_help">
-      <commit_callback
-        function="ShowHelp"
-        parameter="f1_help" />
-    </button>
   </panel>
 </panel>
-- 
cgit v1.2.3


From 6613aebf8802555a47e278d68eef5336763d7d87 Mon Sep 17 00:00:00 2001
From: leyla <leyla@leyla.com>
Date: Mon, 7 Mar 2011 09:47:13 -0800
Subject: SOC-604 Make View contents in minimal skin match Standard skin
 (Viewer 2)

---
 .../skins/minimal/xui/en/floater_camera.xml        | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/floater_camera.xml b/indra/newview/skins/minimal/xui/en/floater_camera.xml
index 62276199e5..76d1b97cab 100644
--- a/indra/newview/skins/minimal/xui/en/floater_camera.xml
+++ b/indra/newview/skins/minimal/xui/en/floater_camera.xml
@@ -253,5 +253,44 @@
      top_pad="0"
      name="buttons"
      width="226">
+    <button
+         height="23"
+         label=""
+         layout="topleft"
+         left="70"
+         is_toggle="true"
+         image_overlay="Cam_Avatar_Off"
+         image_selected="PushButton_Selected_Press"
+         name="presets_btn"
+         tab_stop="false"
+         tool_tip="Preset Views"
+         top="13" 
+         width="25">
+        </button>
+        <button
+         height="23"
+         label=""
+         layout="topleft"
+         left_pad="1"
+         is_toggle="true"
+         image_overlay="PanOrbit_Off"
+         image_selected="PushButton_Selected_Press"
+         name="pan_btn"
+         tab_stop="false"
+         tool_tip="Orbit Zoom Pan"
+         width="25">
+        </button>
+        <button
+         height="23"
+         label=""
+         layout="topleft"
+         left_pad="1"
+         image_overlay="Cam_FreeCam_Off"
+         image_selected="PushButton_Selected_Press"
+         name="avatarview_btn"
+         tab_stop="false"
+         tool_tip="Camera modes"
+         width="25">
+        </button>
     </panel>
 </floater>
-- 
cgit v1.2.3


From c18252451306817ac4a07c823ef615c46edc7e85 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 7 Mar 2011 13:55:33 -0800
Subject: updated list of visible notifications to spec

---
 .../minimal/xui/en/notification_visibility.xml     | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index ee6a9f0b02..e05430636c 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" ?>
 <notification_visibility>
   <respond name="UserGiveItem" response="Discard"/>
-  <respond name="JoinGroup" response="Decline"/>
+  <respond name="ObjectGiveItem" response="Discard"/>
   <respond name="VoiceInviteP2P" response="Decline"/>
   <respond name="VoiceInviteAdHoc" response="Decline"/>
-  <respond name="ObjectGiveItem" response="Discard"/>
   <respond name="VoiceInviteGroup" response="Decline"/>
+
+  <!-- group and voice are disabled features -->
+  <hide tag="group"/>
+  <hide tag="voice"/>
+
+  <!-- refers to preferences -->
+  <hide name="RegionEntryAccessBlocked"/>
+
+  <!-- hints pertaining to UI we don't show -->
+  <hide name="FirstBalanceIncrease"/>
+  <hide name="FirstInventory"/>
+  <hide name="HintSidePanel"/>
+  <hide name="HintMove"/>
+  <hide name="HintDisplayName"/>
   <hide name="HintInventory"/>
   <hide name="HintLindenDollar"/>
-  <hide name="HintMove"/>
-  <hide name="ClothingLoading"/>
-  <hide name="LandBuyPass"/>
-  <hide tag="voice"/>
-  <show name="RegionRestartMinutes"/>
-  <show name="RegionRestartSeconds"/>
-  <show name="PopupAttempt"/>
-  <show tag="confirm"/>
-  <show tag="friendship"/>
-  <show tag="fail"/>
-  <show tag="funds"/>
-  <show type="hint"/>
-  <show type="notifytoast"/>
-  <show name="ModeChange"/>
-  <show name="YouHaveBeenLoggedOut"/>
-  <hide/>
+
+  <!-- show everything else -->
+  <show/>
 </notification_visibility>
 
-- 
cgit v1.2.3


From 93c38d04a1cea317b8083010694d840f76bbc2ec Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 7 Mar 2011 17:02:18 -0800
Subject: updated destination and avatar urls

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 1cc02006f2..45ba785c1f 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -148,16 +148,14 @@
                   follows="all"
                   name="destination_guide_contents"
                   trusted_content="true"
-                  visible="false"
-                  start_url="http://interest.secondlife/viewer/guide"/>
+                  visible="false"/>
                 <web_browser
                   top="0"
                   height="200"
                   follows="all"
                   name="avatar_picker_contents"
                   visible="false"
-                  trusted_content="true"
-                  start_url="http://interest.secondlife/viewer/avatar"/>
+                  trusted_content="true"/>
                 <button
                   name="close"
                   width="22"
-- 
cgit v1.2.3


From 2288264aa004b11b9bbd91dcab5280fa703f1593 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 8 Mar 2011 11:08:19 -0800
Subject: SOCIAL-640 Make View contents in minimal skin match Standard skin
 (Viewer 2

---
 .../skins/minimal/xui/en/floater_camera.xml        | 31 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/floater_camera.xml b/indra/newview/skins/minimal/xui/en/floater_camera.xml
index 62276199e5..e9dd962b28 100644
--- a/indra/newview/skins/minimal/xui/en/floater_camera.xml
+++ b/indra/newview/skins/minimal/xui/en/floater_camera.xml
@@ -245,7 +245,7 @@
          </joystick_track>
         </panel>
     </panel>
-    <panel
+   	<panel
      border="false"
      height="42"
      layout="topleft"
@@ -253,5 +253,32 @@
      top_pad="0"
      name="buttons"
      width="226">
-    </panel>
+		<button
+         height="23"
+         label=""
+         layout="topleft"
+         left="83"
+         is_toggle="true"
+         image_overlay="Cam_Avatar_Off"
+         image_selected="PushButton_Selected_Press"
+         name="presets_btn"
+         tab_stop="false"
+         tool_tip="Preset Views"
+         top="13"
+         width="25">
+		</button>
+		<button
+         height="23"
+         label=""
+         layout="topleft"
+         left_pad="1"
+         is_toggle="true"
+         image_overlay="PanOrbit_Off"
+         image_selected="PushButton_Selected_Press"
+         name="pan_btn"
+         tab_stop="false"
+         tool_tip="Orbit Zoom Pan"
+         width="25">
+		</button>
+	</panel>
 </floater>
-- 
cgit v1.2.3


From 47b77c7f7a777ae533863c3c7b4f68d518117c32 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 8 Mar 2011 11:17:34 -0800
Subject: updated list of visible notifications to spec

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index e05430636c..631cf5d42c 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -11,7 +11,7 @@
   <hide tag="voice"/>
 
   <!-- refers to preferences -->
-  <hide name="RegionEntryAccessBlocked"/>
+  <hide name="RegionEntryAccessBlocked_Change"/>
 
   <!-- hints pertaining to UI we don't show -->
   <hide name="FirstBalanceIncrease"/>
-- 
cgit v1.2.3


From 3732ac46e691f27d181c07b7c511c3c433f9c665 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 8 Mar 2011 12:18:57 -0800
Subject: SOCIAL-647 FIX Gear menu for your own avatar is empty in
 mini-inspector in minimal s

---
 .../minimal/xui/en/menu_inspect_self_gear.xml      | 219 ++++++++++++++++++++-
 1 file changed, 218 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
index 28c4762eaa..be51e3e664 100644
--- a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
@@ -1,2 +1,219 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu/>
+<toggleable_menu
+ layout="topleft"
+ name="Self Pie">
+  <menu_item_call
+   label="Sit Down"
+   layout="topleft"
+   name="Sit Down Here">
+    <menu_item_call.on_click
+     function="Self.SitDown"
+     parameter="" />
+    <menu_item_call.on_enable
+     function="Self.EnableSitDown" />
+  </menu_item_call>
+  <menu_item_call
+   label="Stand Up"
+   layout="topleft"
+   name="Stand Up">
+    <menu_item_call.on_click
+     function="Self.StandUp"
+     parameter="" />
+    <menu_item_call.on_enable
+     function="Self.EnableStandUp" />
+  </menu_item_call>
+  <context_menu
+   label="Take Off"
+   layout="topleft"
+   name="Take Off &gt;">
+    <context_menu
+     label="Clothes"
+     layout="topleft"
+     name="Clothes &gt;">
+      <menu_item_call
+       enabled="false"
+       label="Shirt"
+       layout="topleft"
+       name="Shirt">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="shirt" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="shirt" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Pants"
+       layout="topleft"
+       name="Pants">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="pants" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="pants" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Skirt"
+       layout="topleft"
+       name="Skirt">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="skirt" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="skirt" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Shoes"
+       layout="topleft"
+       name="Shoes">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="shoes" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="shoes" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Socks"
+       layout="topleft"
+       name="Socks">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="socks" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="socks" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Jacket"
+       layout="topleft"
+       name="Jacket">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="jacket" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="jacket" />
+      </menu_item_call>
+      <menu_item_call
+       enabled="false"
+       label="Gloves"
+       layout="topleft"
+       name="Gloves">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="gloves" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="gloves" />
+      </menu_item_call>
+      <menu_item_call
+            enabled="false"
+            label="Undershirt"
+            layout="topleft"
+            name="Self Undershirt">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="undershirt" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="undershirt" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Underpants"
+        layout="topleft"
+        name="Self Underpants">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="underpants" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="underpants" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Tattoo"
+        layout="topleft"
+        name="Self Tattoo">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="tattoo" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="tattoo" />
+      </menu_item_call>
+      <menu_item_call
+        enabled="false"
+        label="Alpha"
+        layout="topleft"
+        name="Self Alpha">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="alpha" />
+        <menu_item_call.on_enable
+         function="Edit.EnableTakeOff"
+         parameter="alpha" />
+      </menu_item_call>
+      <menu_item_separator
+       layout="topleft" />
+      <menu_item_call
+       label="All Clothes"
+       layout="topleft"
+       name="All Clothes">
+        <menu_item_call.on_click
+         function="Edit.TakeOff"
+         parameter="all" />
+      </menu_item_call>
+    </context_menu>
+    <context_menu
+     label="HUD"
+     layout="topleft"
+     name="Object Detach HUD" />
+    <context_menu
+     label="Detach"
+     layout="topleft"
+     name="Object Detach" />
+    <menu_item_call
+     label="Detach All"
+     layout="topleft"
+     name="Detach All">
+      <menu_item_call.on_click
+       function="Self.RemoveAllAttachments"
+       parameter="" />
+      <menu_item_call.on_enable
+       function="Self.EnableRemoveAllAttachments" />
+    </menu_item_call>
+  </context_menu>
+  <menu_item_call
+    label="My Friends"
+    layout="topleft"
+    name="Friends...">
+    <menu_item_call.on_click
+     function="SideTray.PanelPeopleTab"
+     parameter="friends_panel" />
+  </menu_item_call>
+  <menu_item_call
+    label="My Profile"
+    layout="topleft"
+    name="Profile...">
+    <menu_item_call.on_click
+     function="ShowAgentProfile"
+     parameter="agent" />
+  </menu_item_call>
+  <menu_item_call
+   label="Debug Textures"
+       name="Debug...">
+    <menu_item_call.on_click
+     function="Avatar.Debug" />
+    <menu_item_call.on_visible
+     function="IsGodCustomerService"/>
+  </menu_item_call>
+</context_menu>
-- 
cgit v1.2.3


From c87e895304f25ea7e77d45ac2ce31164b86ee529 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 8 Mar 2011 15:12:42 -0800
Subject: SOCIAL-647 FIX Gear menu for your own avatar is empty in
 mini-inspector in minimal s

---
 indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
index be51e3e664..ed3b75342f 100644
--- a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
@@ -216,4 +216,4 @@
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
-</context_menu>
+</toggleable_menu>
-- 
cgit v1.2.3


From f47a9a4ea3d40ecaf03e853469b1570a4ad72ce7 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 9 Mar 2011 11:14:50 -0800
Subject: SOCIAL-656 FIX Call button shown on Conference IM window in minimal
 skin

---
 .../minimal/xui/en/panel_adhoc_control_panel.xml   | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..5730adab8a
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="false"
+ follows="all"
+ height="215"
+ name="panel_im_control_panel"
+ width="150">
+    <layout_stack
+     mouse_opaque="false"
+     border_size="0"
+     clip="false"
+     follows="all"
+     height="215"
+     layout="topleft"
+     left="3"
+     name="vertical_stack"
+     orientation="vertical"
+     top="0"
+     width="147">
+        <layout_panel
+         auto_resize="true"
+         follows="top|left"
+         height="130"
+         layout="topleft"
+         left="0"
+         min_height="0"
+         mouse_opaque="false"
+         width="147"
+         top="0"
+         name="speakers_list_panel"
+         user_resize="false">
+            <avatar_list
+             color="DkGray2"
+             follows="all"
+             height="130"
+             ignore_online_status="true"
+             layout="topleft"
+             name="speakers_list"
+             opaque="false"
+             show_info_btn="true"
+             show_profile_btn="false"
+             show_speaking_indicator="false"
+             width="147" />
+        </layout_panel>
+    </layout_stack>
+</panel>
-- 
cgit v1.2.3


From 594cd5710bf0493defd8062f4d37919442d56193 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 9 Mar 2011 13:38:53 -0800
Subject: SOCIAL-647 FIX Gear menu for your own avatar is empty in
 mini-inspector in minimal skin Removed take off menu

---
 .../minimal/xui/en/menu_inspect_self_gear.xml      | 170 ---------------------
 1 file changed, 170 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
index ed3b75342f..ae8b640d26 100644
--- a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml
@@ -22,176 +22,6 @@
     <menu_item_call.on_enable
      function="Self.EnableStandUp" />
   </menu_item_call>
-  <context_menu
-   label="Take Off"
-   layout="topleft"
-   name="Take Off &gt;">
-    <context_menu
-     label="Clothes"
-     layout="topleft"
-     name="Clothes &gt;">
-      <menu_item_call
-       enabled="false"
-       label="Shirt"
-       layout="topleft"
-       name="Shirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Pants"
-       layout="topleft"
-       name="Pants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="pants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="pants" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Skirt"
-       layout="topleft"
-       name="Skirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="skirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="skirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Shoes"
-       layout="topleft"
-       name="Shoes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shoes" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shoes" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Socks"
-       layout="topleft"
-       name="Socks">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="socks" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="socks" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Jacket"
-       layout="topleft"
-       name="Jacket">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="jacket" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="jacket" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Gloves"
-       layout="topleft"
-       name="Gloves">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="gloves" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="gloves" />
-      </menu_item_call>
-      <menu_item_call
-            enabled="false"
-            label="Undershirt"
-            layout="topleft"
-            name="Self Undershirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="undershirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="undershirt" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Underpants"
-        layout="topleft"
-        name="Self Underpants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="underpants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="underpants" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Tattoo"
-        layout="topleft"
-        name="Self Tattoo">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="tattoo" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="tattoo" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Alpha"
-        layout="topleft"
-        name="Self Alpha">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="alpha" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="alpha" />
-      </menu_item_call>
-      <menu_item_separator
-       layout="topleft" />
-      <menu_item_call
-       label="All Clothes"
-       layout="topleft"
-       name="All Clothes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="all" />
-      </menu_item_call>
-    </context_menu>
-    <context_menu
-     label="HUD"
-     layout="topleft"
-     name="Object Detach HUD" />
-    <context_menu
-     label="Detach"
-     layout="topleft"
-     name="Object Detach" />
-    <menu_item_call
-     label="Detach All"
-     layout="topleft"
-     name="Detach All">
-      <menu_item_call.on_click
-       function="Self.RemoveAllAttachments"
-       parameter="" />
-      <menu_item_call.on_enable
-       function="Self.EnableRemoveAllAttachments" />
-    </menu_item_call>
-  </context_menu>
   <menu_item_call
     label="My Friends"
     layout="topleft"
-- 
cgit v1.2.3


From e3625b7e01900971093823007ba56730a78fdfe6 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 9 Mar 2011 13:46:24 -0800
Subject: SOCIAL-658 FIX lldialog is active in minimal skin

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 631cf5d42c..4fb08a3959 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -13,6 +13,9 @@
   <!-- refers to preferences -->
   <hide name="RegionEntryAccessBlocked_Change"/>
 
+  <!-- no spammy scripts -->
+  <hide name="ScriptDialog"/>
+
   <!-- hints pertaining to UI we don't show -->
   <hide name="FirstBalanceIncrease"/>
   <hide name="FirstInventory"/>
-- 
cgit v1.2.3


From 7e70e8ba5b49f85186ed9d1bd124cd847ea032cc Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 9 Mar 2011 14:02:54 -0800
Subject: SOCIAL-651 FIX Remove text from login screen Mode selector
 "(default)"

---
 indra/newview/skins/minimal/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_login.xml b/indra/newview/skins/minimal/xui/en/panel_login.xml
index 9b07051d81..65527660ad 100644
--- a/indra/newview/skins/minimal/xui/en/panel_login.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_login.xml
@@ -137,7 +137,7 @@ top="20"
   name="mode_combo"
   width="120">
 <combo_box.item
-  label="Basic (Default)"
+  label="Basic"
   name="Basic"
   value="settings_minimal.xml" />
 <combo_box.item
-- 
cgit v1.2.3


From 56abf4eff6288938e19eaa12d6150edfc9cc4be8 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 9 Mar 2011 15:37:07 -0800
Subject: SOCIAL-653 FIX Object inspectors have Buy, Pay, and Wear options in
 minimal skin remove more options from object inspector gear menu

---
 .../minimal/xui/en/menu_inspect_object_gear.xml    | 64 ----------------------
 1 file changed, 64 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml
index 6a1b1d8fc7..8ec360a604 100644
--- a/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml
@@ -24,61 +24,6 @@
     <menu_item_call.on_visible
      function="Object.EnableSit"/>
   </menu_item_call>
-  <menu_item_call
-   label="Pay"
-   layout="topleft"
-   name="pay">
-    <menu_item_call.on_click
-     function="InspectObject.Pay"/>
-    <menu_item_call.on_visible
-     function="EnablePayObject" />
-  </menu_item_call>
-  <menu_item_call
-   label="Buy"
-   layout="topleft"
-   enabled="true" 
-   name="buy">
-    <menu_item_call.on_click
-     function="InspectObject.Buy"/>
-    <menu_item_call.on_visible
-     function="Object.VisibleBuy" />
-  </menu_item_call>
-  <menu_item_call
-   label="Take Copy"
-   layout="topleft"
-   name="take_copy">
-    <menu_item_call.on_click
-     function="InspectObject.TakeFreeCopy"/>
-    <menu_item_call.on_visible
-      function="Tools.EnableTakeCopy"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Open"
-   layout="topleft"
-   name="open">
-    <menu_item_call.on_click
-     function="InspectObject.Open"/>
-    <menu_item_call.on_visible
-     function="Object.EnableOpen" />
-  </menu_item_call>
-  <menu_item_call
-   label="Wear"
-   layout="topleft"
-   name="wear">
-    <menu_item_call.on_click
-     function="Object.AttachToAvatar" />
-    <menu_item_call.on_visible
-     function="Object.EnableWear" />
-  </menu_item_call>  
-  <menu_item_call
-   label="Add"
-   layout="topleft"
-   name="add">
-    <menu_item_call.on_click
-     function="Object.AttachAddToAvatar" />
-    <menu_item_call.on_visible
-     function="Object.EnableWear" />
-  </menu_item_call>
   <menu_item_call
    label="Report"
    layout="topleft"
@@ -102,13 +47,4 @@
     <menu_item_call.on_click
      function="InspectObject.ZoomIn" />
   </menu_item_call>    
-  <menu_item_call
-   label="Remove"
-   layout="topleft"
-   name="remove">
-      <menu_item_call.on_click
-       function="Object.Delete" />
-      <menu_item_call.on_visible
-       function="Object.EnableDelete" />
-  </menu_item_call>
 </toggleable_menu>
-- 
cgit v1.2.3


From 2da73b89915223c93e64437445db1d83c1d091df Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 9 Mar 2011 15:57:41 -0800
Subject: added touch and detach to attachment context menu

---
 .../skins/minimal/xui/en/menu_attachment_self.xml  | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml b/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml
index fb19c5eb2c..542a7dc7dc 100644
--- a/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml
@@ -1,2 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<context_menu/>
+<context_menu
+ layout="topleft"
+ name="Attachment Pie">
+  <menu_item_call
+   enabled="false"
+   label="Touch"
+   layout="topleft"
+   name="Attachment Object Touch">
+    <menu_item_call.on_click
+     function="Object.Touch" />
+    <menu_item_call.on_enable
+     function="Object.EnableTouch"
+     name="EnableTouch"/>
+  </menu_item_call>
+  <menu_item_call
+   enabled="false"
+   label="Detach"
+   layout="topleft"
+   name="Detach">
+    <menu_item_call.on_click
+     function="Attachment.Detach" />
+    <menu_item_call.on_enable
+     function="Attachment.EnableDetach" />
+  </menu_item_call>
+</context_menu>
-- 
cgit v1.2.3


From bb57d34cb1db372322f196ba3fd9190a352a71e3 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 10 Mar 2011 12:08:44 -0800
Subject: SOCIAL-620 No tooltip on mode drop down box on login screen

---
 indra/newview/skins/minimal/xui/en/panel_login.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_login.xml b/indra/newview/skins/minimal/xui/en/panel_login.xml
index 9b07051d81..f612b58074 100644
--- a/indra/newview/skins/minimal/xui/en/panel_login.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_login.xml
@@ -133,6 +133,7 @@ top="20"
   height="23"
   max_chars="128"
   top_pad="0"
+  tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
   control_name="SessionSettingsFile"
   name="mode_combo"
   width="120">
-- 
cgit v1.2.3


From 919110eb4482b9bbe6651220081117be4479dec6 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Mar 2011 14:52:45 -0800
Subject: SOCIAL-682 FIX Turn on RegionEntryAccessBlocked_Change notification

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 4fb08a3959..2fc1d81a01 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -10,9 +10,6 @@
   <hide tag="group"/>
   <hide tag="voice"/>
 
-  <!-- refers to preferences -->
-  <hide name="RegionEntryAccessBlocked_Change"/>
-
   <!-- no spammy scripts -->
   <hide name="ScriptDialog"/>
 
-- 
cgit v1.2.3


From 1898768009d9eceafc4d95e8ee291023d30be399 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Mar 2011 14:53:41 -0800
Subject: re-enabling lldialog pending further discussion

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 2fc1d81a01..555d437c57 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -11,7 +11,7 @@
   <hide tag="voice"/>
 
   <!-- no spammy scripts -->
-  <hide name="ScriptDialog"/>
+  <!-- <hide name="ScriptDialog"/> -->
 
   <!-- hints pertaining to UI we don't show -->
   <hide name="FirstBalanceIncrease"/>
-- 
cgit v1.2.3


From d48a0f38ac693d8a6e1a0d09c9d342cc2ab1d513 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 10 Mar 2011 20:21:01 -0800
Subject: SOCIAL-530 WIP When double clicking a nearby location I want my
 avatar to walk to that spot Turn off "autopilot cancelled" spam

---
 indra/newview/skins/minimal/xui/en/notification_visibility.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 555d437c57..9d4836d328 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -22,6 +22,9 @@
   <hide name="HintInventory"/>
   <hide name="HintLindenDollar"/>
 
+  <!-- spam from servers, such as "Autopilot cancelled" -->
+  <hide name="SystemMessageTip"/>
+  
   <!-- show everything else -->
   <show/>
 </notification_visibility>
-- 
cgit v1.2.3


From 284d53b9009417294d78ac109443938f483e4396 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 11 Mar 2011 16:36:37 -0800
Subject: SOCIAL-630 FIX Group chats received in minimal skin and group side
 panel available from group chat window

---
 .../minimal/xui/en/panel_group_control_panel.xml   | 79 ++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml
new file mode 100644
index 0000000000..abddc59296
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="false"
+ follows="all"
+ height="238"
+ name="panel_im_control_panel"
+ width="150">
+    <layout_stack
+     mouse_opaque="false"
+     border_size="0"
+     clip="false"
+     follows="all"
+     height="238"
+     layout="topleft"
+     left="5"
+     name="vertical_stack"
+     orientation="vertical"
+     top="0"
+     width="145">
+        <layout_panel
+         auto_resize="true"
+         follows="top|left"
+         height="100"
+         layout="topleft"
+         min_height="0"
+         mouse_opaque="false"
+         width="145"
+         top="0"
+         name="speakers_list_panel"
+         user_resize="false">
+            <avatar_list
+             color="DkGray2"
+             follows="all"
+             height="100"
+             ignore_online_status="true"
+             layout="topleft"
+             name="speakers_list"
+             opaque="false"
+             show_info_btn="true"
+             show_profile_btn="false"
+             show_speaking_indicator="false"
+             width="145" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="130"
+         name="end_call_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="23"
+             label="Leave Call"
+             name="end_call_btn"
+             use_ellipses="true" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         width="130"
+         name="voice_ctrls_btn_panel"
+         user_resize="false"
+         visible="false">
+            <button
+             follows="all"
+             height="23"
+             label="Open Voice Controls"
+             name="voice_ctrls_btn"
+             use_ellipses="true" />
+        </layout_panel>
+    </layout_stack>
+</panel>
-- 
cgit v1.2.3


From 98bd63e0c8c73e300ae4af8071a9e2f167cfd6a6 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 14 Mar 2011 12:47:54 -0700
Subject: SOCIAL-684 Right-click context menu on People Panel in Basic Mode is
 missing

---
 .../skins/minimal/xui/en/menu_people_nearby.xml    | 61 +++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml b/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml
index fb19c5eb2c..3d64133f54 100644
--- a/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/minimal/xui/en/menu_people_nearby.xml
@@ -1,2 +1,61 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<context_menu/>
+<context_menu
+ layout="topleft"
+ name="Avatar Context Menu">
+	<menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="View Profile">
+		<menu_item_call.on_click
+         function="Avatar.Profile" />
+	</menu_item_call>
+	<menu_item_call
+     label="Add Friend"
+     layout="topleft"
+     name="Add Friend">
+		<menu_item_call.on_click
+         function="Avatar.AddFriend" />
+		<menu_item_call.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_add" />
+	</menu_item_call>
+	<menu_item_call
+     label="Remove Friend"
+     layout="topleft"
+     name="Remove Friend">
+		<menu_item_call.on_click
+         function="Avatar.RemoveFriend" />
+		<menu_item_call.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_delete" />
+	</menu_item_call>
+	<menu_item_call
+     label="IM"
+     layout="topleft"
+     name="IM">
+		<menu_item_call.on_click
+         function="Avatar.IM" />
+	</menu_item_call>
+	<menu_item_check
+     label="Block/Unblock"
+     layout="topleft"
+     name="Block/Unblock">
+		<menu_item_check.on_click
+         function="Avatar.BlockUnblock" />
+		<menu_item_check.on_check
+         function="Avatar.CheckItem"
+         parameter="is_blocked" />
+		<menu_item_check.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_block" />
+	</menu_item_check>
+	<menu_item_call
+    label="Offer Teleport"
+    name="teleport">
+		<menu_item_call.on_click
+		 function="Avatar.OfferTeleport"/>
+		<menu_item_call.on_enable
+		function="Avatar.EnableItem"
+		parameter="can_offer_teleport"/>
+	</menu_item_call>
+</context_menu>
-- 
cgit v1.2.3


From 91eb7f2e048369ddfc76eb2fbae83fa50ad8322a Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Mon, 14 Mar 2011 15:21:59 -0700
Subject: SOCIAL-653 FIX Object inspectors have Buy, Pay, and Wear options in
 minimal skin

---
 indra/newview/skins/minimal/xui/en/inspect_object.xml | 16 ----------------
 1 file changed, 16 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml
index a5b03a2f58..f424069ec6 100644
--- a/indra/newview/skins/minimal/xui/en/inspect_object.xml
+++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml
@@ -98,22 +98,6 @@ L$30,000
    use_ellipses="true">
    http://www.superdupertest.com
 </text>
-  <button
-   follows="top|left"
-   height="20"
-   label="Buy"
-   left="8"
-   name="buy_btn"
-   top="121"
-   width="80" />
-  <button
-   follows="top|left"
-   height="20"
-   label="Pay"
-   left_delta="0"
-   name="pay_btn"
-   top_delta="0"
-   width="80" />
   <button
    follows="top|left"
    height="20"
-- 
cgit v1.2.3


From 5b7b82d4049c00e33decfea7753f06fbd5ef07c0 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 14 Mar 2011 16:59:44 -0700
Subject: SOCIAL-718 FIX remove help? from profiles panel and media browser in
 miimal skin

---
 .../skins/minimal/xui/en/floater_media_browser.xml | 242 +++++++++++++++++++++
 .../skins/minimal/xui/en/floater_web_content.xml   | 189 ++++++++++++++++
 2 files changed, 431 insertions(+)
 create mode 100644 indra/newview/skins/minimal/xui/en/floater_media_browser.xml
 create mode 100644 indra/newview/skins/minimal/xui/en/floater_web_content.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/floater_media_browser.xml b/indra/newview/skins/minimal/xui/en/floater_media_browser.xml
new file mode 100644
index 0000000000..4862146c94
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/floater_media_browser.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="440"
+ layout="topleft"
+ min_height="140"
+ min_width="467"
+ name="floater_about"
+ save_rect="true"
+ auto_tile="true"
+ title="MEDIA BROWSER"
+ width="820">
+    <floater.string
+     name="home_page_url">
+        http://www.secondlife.com
+    </floater.string>
+    <floater.string
+     name="support_page_url">
+        http://support.secondlife.com
+    </floater.string>
+    <layout_stack
+     bottom="440"
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="10"
+     name="stack1"
+     orientation="vertical" 
+     top="20"
+     width="800">
+        <layout_panel
+         auto_resize="false"
+         default_tab_group="1" 
+         height="20"
+         layout="topleft"
+         left="0"
+         min_height="20"
+         name="nav_controls"
+         top="400"
+         user_resize="false"
+         width="800">
+            <button
+             follows="left|top"
+             height="20"
+             label="Back"
+             layout="topleft"
+             left="0"
+             name="back"
+             top="0"
+             width="55">
+				<button.commit_callback
+				function="MediaBrowser.Back" />
+			</button>
+            <button
+             follows="left|top"
+             height="20"
+             label="Forward"
+             layout="topleft"
+             left_pad="3"
+             name="forward"
+             top_delta="0"
+             width="68">
+				<button.commit_callback
+				function="MediaBrowser.Forward" />
+			</button>
+            <button
+             enabled="false"
+             follows="left|top"
+             height="20"
+             label="Reload"
+             layout="topleft"
+             left_pad="2"
+             name="reload"
+             top_delta="0"
+             width="70">
+				<button.commit_callback
+				function="MediaBrowser.Refresh" />
+			</button>
+            <combo_box
+             allow_text_entry="true"
+             follows="left|top|right"
+             tab_group="1"
+             height="20"
+             layout="topleft"
+             left_pad="5"
+             max_chars="1024"
+             name="address"
+             combo_editor.select_on_focus="true"
+             top_delta="0"
+             width="540">
+				<combo_box.commit_callback
+				function="MediaBrowser.EnterAddress" />
+			</combo_box>
+            <button
+             enabled="false"
+             follows="right|top"
+             height="20"
+             label="Go"
+             layout="topleft"
+             left_pad="5"
+             name="go"
+             top_delta="0"
+             width="50">
+				<button.commit_callback
+				function="MediaBrowser.Go" />
+			</button>
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         height="20"
+         layout="topleft"
+         left_delta="0"
+         min_height="20"         
+         name="time_controls"
+         top_delta="0"
+         user_resize="false"
+         width="800">
+            <button
+             follows="left|top"
+             height="20"
+             label="rewind"
+             layout="topleft"
+             left="0"
+             name="rewind"
+             top="0"
+             width="55" />
+            <button
+             follows="left|top"
+             height="20"
+             image_selected="button_anim_play_selected.tga"
+             image_unselected="button_anim_play.tga"
+             layout="topleft"
+             left_delta="55"
+             name="play"
+             top_delta="0"
+             width="55" />
+            <button
+             follows="left|top"
+             height="20"
+             image_selected="button_anim_pause_selected.tga"
+             image_unselected="button_anim_pause.tga"
+             layout="topleft"
+             left_delta="0"
+             name="pause"
+             top_delta="0"
+             width="55" />
+            <button
+             follows="left|top"
+             height="20"
+             label="stop"
+             layout="topleft"
+             left_pad="10"
+             name="stop"
+             top_delta="0"
+             width="55" />
+            <button
+             follows="left|top"
+             height="20"
+             label="forward"
+             layout="topleft"
+             left_pad="20"
+             name="seek"
+             top_delta="0"
+             width="55" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         height="20"
+         layout="topleft"
+         left_delta="0"
+         min_height="20"         
+         name="parcel_owner_controls"
+         top_delta="0"
+         user_resize="false"
+         width="540">
+            <button
+             enabled="false"
+             follows="left|top"
+             height="20"
+             label="Send Current Page to Parcel"
+             layout="topleft"
+             left="0"
+             name="assign"
+             top="0"
+             width="200">
+				<button.commit_callback
+				function="MediaBrowser.Assign" />
+			</button>
+        </layout_panel>
+        <layout_panel
+         height="40"
+         layout="topleft"
+         left_delta="0"
+         name="external_controls"
+         top_delta="0"
+         user_resize="false"
+         width="540">
+          <web_browser
+             bottom="-30"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="browser"
+             top="0"
+             width="540" />
+            <button
+             follows="bottom|left"
+             height="20"
+             label="Open in My Web Browser"
+             layout="topleft"
+             left_delta="0"
+             name="open_browser"
+             top_pad="5"
+             width="185">
+              <button.commit_callback
+                function="MediaBrowser.OpenWebBrowser" />
+            </button>
+            <check_box
+             control_name="UseExternalBrowser"
+             follows="bottom|left"
+             height="20"
+             label="Always open in my web browser"
+             layout="topleft"
+             left_pad="5"
+             name="open_always"
+             top_delta="0"
+             width="200" />
+            <button
+             follows="bottom|right"
+             height="20"
+             label="Close"
+             layout="topleft"
+             left_pad="80"
+             name="close"
+             top_delta="0"
+             width="70">
+				<button.commit_callback
+				function="MediaBrowser.Close" />
+			</button>
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/minimal/xui/en/floater_web_content.xml b/indra/newview/skins/minimal/xui/en/floater_web_content.xml
new file mode 100644
index 0000000000..50cb5b14ce
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/floater_web_content.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  legacy_header_height="18"
+  can_resize="true"
+  height="775"
+  layout="topleft"
+  min_height="400"
+  min_width="500"
+  name="floater_web_content"
+  save_rect="true"
+  auto_tile="true"
+  title=""
+  initial_mime_type="text/html"
+  width="780">
+  <layout_stack
+    bottom="775"
+    follows="left|right|top|bottom"
+    layout="topleft"
+    left="5"
+    name="stack1"
+    orientation="vertical"
+    top="20"
+    width="770">
+    <layout_panel
+      auto_resize="false"
+      default_tab_group="1"
+      height="22"
+      layout="topleft"
+      left="0"
+      min_height="20"
+      name="nav_controls"
+      top="400"
+      user_resize="false"
+      width="770">
+      <button
+        image_overlay="Arrow_Left_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+		    hover_glow_amount="0.15"
+        tool_tip="Navigate back"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="1"
+        name="back"
+        top="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Back" />
+      </button>
+      <button
+        image_overlay="Arrow_Right_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        tool_tip="Navigate forward"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="27"
+        name="forward"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Forward" />
+      </button>
+      <button
+        image_overlay="Stop_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        tool_tip="Stop navigation"
+        enabled="true"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="stop"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Stop" />
+      </button>
+      <button
+        image_overlay="Refresh_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        tool_tip="Reload page"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="reload"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Reload" />
+      </button>
+      <combo_box
+        allow_text_entry="true"
+        follows="left|top|right"
+        tab_group="1"
+        height="22"
+        layout="topleft"
+        left_pad="4"
+        max_chars="1024"
+        name="address"
+        combo_editor.select_on_focus="true"
+        tool_tip="Enter URL here"
+        top_delta="0"
+        width="672">
+        <combo_box.commit_callback
+          function="WebContent.EnterAddress" />
+      </combo_box>
+      <icon
+        name="media_secure_lock_flag"
+        height="16"
+        follows="top|right"
+        image_name="Lock2"
+        layout="topleft"
+        left_delta="620"
+        top_delta="2"
+        visible="false" 
+        tool_tip="Secured Browsing"
+        width="16" />
+      <button
+        image_overlay="ExternalBrowser_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        tool_tip="Open current URL in your desktop browser"
+        follows="right|top"
+        enabled="true" 
+        height="22"
+        layout="topleft"
+        name="popexternal"
+        right="770"
+        top_delta="-2"
+        width="22">
+        <button.commit_callback
+          function="WebContent.PopExternal" />
+      </button>
+    </layout_panel>
+    <layout_panel
+      height="40"
+      layout="topleft"
+      left_delta="0"
+      name="external_controls"
+      top_delta="0"
+      user_resize="false"
+      width="585">
+      <web_browser
+        bottom="-22"
+        follows="all"
+        layout="topleft"
+        left="0"
+        name="webbrowser"
+        top="0"/>
+      <text
+        type="string"
+        length="200"
+        follows="bottom|left"
+        height="20"
+        layout="topleft"
+        left_delta="0"
+        name="statusbartext"
+        parse_urls="false"
+        text_color="0.4 0.4 0.4 1"
+        top_pad="5"
+        width="495"/>
+      <progress_bar
+        color_bar="0.3 1.0 0.3 1"
+        follows="bottom|right"
+        height="16"
+        top_delta="-1"
+        left_pad="24"
+        layout="topleft"
+        name="statusbarprogress"
+        width="64"/>
+    </layout_panel>
+  </layout_stack>
+</floater>
-- 
cgit v1.2.3


From 4986896079c90c2fff1f72ccf78a4bb6ee9bbcb8 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 14 Mar 2011 17:21:45 -0700
Subject: SOCIAL-605 Bottom bar buttons scale differently at lower resolutions

---
 .../skins/minimal/xui/en/panel_bottomtray.xml      | 483 +++++++++++----------
 1 file changed, 244 insertions(+), 239 deletions(-)

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

diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index ccecdd9ece..0145de8be9 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -9,19 +9,19 @@
  layout="topleft"
  left="0"
  name="bottom_tray"
- focus_root="true" 
+ focus_root="true"
  top="28"
  width="1310">
-    <string
+	<string
      name="DragIndicationImageName"
      value="Accordion_ArrowOpened_Off" />
-    <string
+	<string
      name="SpeakBtnToolTip"
      value="Turns microphone on/off" />
-    <string
+	<string
      name="VoiceControlBtnToolTip"
      value="Shows/hides voice control panel" />
-    <layout_stack
+	<layout_stack
      border_size="0"
      clip="false"
      follows="all"
@@ -33,33 +33,33 @@
      orientation="horizontal"
      top="0"
      width="1310">
-        <layout_panel
+		<layout_panel
          auto_resize="false"
-         user_resize="false" 
+         user_resize="false"
          min_width="2"
          width="2" />
-        <layout_panel
+		<layout_panel
          auto_resize="false"
          layout="topleft"
          max_width="320"
          min_width="214"
-         height="28" 
+         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="306"
-            top="0"
-            mouse_opaque="false"
-            follows="left|right"
+			<panel
+		   name="chat_bar"
+			  filename="panel_nearby_chat_bar.xml"
+			  left="0"
+			  height="28"
+			  width="306"
+			  top="0"
+			  mouse_opaque="false"
+			  follows="left|right"
           />
-        </layout_panel>
-        <layout_panel
+		</layout_panel>
+		<layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -71,27 +71,27 @@
          top_delta="0"
          user_resize="false"
          width="85">
-            <gesture_combo_list
+			<gesture_combo_list
              follows="left|right"
              height="23"
              label="Gesture"
              layout="topleft"
              get_more="false"
-             view_all="false" 
+             view_all="false"
              left="0"
              name="Gesture"
              tool_tip="Shows/hides gestures"
              top="5"
              width="82">
-                <combo_button
+				<combo_button
                  pad_right="10"
-                 can_drag="false" 
+                 can_drag="false"
                  use_ellipses="true" />
-                <combo_list
+				<combo_list
                  page_lines="17" />
-            </gesture_combo_list>
-        </layout_panel>
-        <layout_panel
+			</gesture_combo_list>
+		</layout_panel>
+		<layout_panel
          auto_resize="false"
          follows="left|right"
          height="28"
@@ -102,8 +102,8 @@
          name="cam_panel"
          user_resize="false"
          width="83">
-            <bottomtray_button
-              can_drag="false" 
+			<bottomtray_button
+              can_drag="false"
              follows="left|right"
              height="23"
              image_pressed="PushButton_Press"
@@ -118,12 +118,12 @@
              top="5"
              use_ellipses="true"
              width="80">
-                <init_callback
+				<init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="camera" />
-            </bottomtray_button>
-        </layout_panel>
-        <layout_panel
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
          auto_resize="false"
          follows="left|right"
          height="28"
@@ -132,90 +132,95 @@
          name="splitter_panel"
          user_resize="false"
          width="17">
-            <icon
+			<icon
              follows="left|bottom"
              height="18"
-             width="2" 
-             left="6" 
-             image_name="Button_Separator" 
-             name="separator" 
+             width="2"
+             left="6"
+             image_name="Button_Separator"
+             name="separator"
              top="7"/>
-        </layout_panel>
-      <layout_panel
-        auto_resize="false"
-        follows="left|right"
-        height="28"
-        layout="topleft"
-        min_height="28"
-        min_width="206"
-        mouse_opaque="false"
-        name="avatar_and_destinations_panel"
-        user_resize="false"
-        width="206">
-        <radio_group name="avatar_and_destination_btns"
-                     commit_callback.function="DestinationAndAvatar.show" 
-                     allow_deselect="true"
-                     top="5"
-                     left="0"
-                     height="23" 
-                     width="206">
-          <radio_item left="0" 
-                      height="23"
-                      bottom="0"
-                      width="100"
-                      name="destination_btn"
-                      value="0">
-            <check_button  image_pressed="PushButton_Press"
-                           image_pressed_selected="PushButton_Selected_Press"
-                           image_selected="PushButton_Selected_Press"
-                           image_unselected="PushButton_Off"
-                           scale_image="true"
-                           font="SansSerifSmall"
-                           label="Destinations"
-                           left="0"
-                           height="23"
-                           width="100"
-                           bottom="0"/>
-          </radio_item>
-          <radio_item left="105"
-                      height="23"
-                      bottom="0"
-                      width="100"
-                      name="avatar_btn"
-                      value="1">
-            <check_button  image_pressed="PushButton_Press"
-                           image_pressed_selected="PushButton_Selected_Press"
-                           image_selected="PushButton_Selected_Press"
-                           image_unselected="PushButton_Off"
-                           scale_image="true"
-                           font="SansSerifSmall"
-                           label="My Avatar"
-                           left="0"
-                           height="23"
-                           width="100"
-                           bottom="0"/>
-          </radio_item>
-        </radio_group>
-       </layout_panel>
-       <layout_panel
-         auto_resize="false"
-         follows="left|right"
-         height="28"
-         layout="topleft"
-         min_width="17"
-         name="splitter_panel"
-         user_resize="false"
-         width="17">
-            <icon
+		</layout_panel>
+		<layout_panel
+		  auto_resize="false"
+		  follows="left|right"
+		  height="28"
+		  layout="topleft"
+		  min_height="28"
+		  min_width="83"
+		  mouse_opaque="false"
+		  name="avatar_and_destinations_panel"
+		  user_resize="false"
+		  width="103">
+			<bottomtray_button
+			 can_drag="false"
+			follows="left|right"
+			height="23"
+			image_pressed="PushButton_Press"
+			image_pressed_selected="PushButton_Selected_Press"
+			image_selected="PushButton_Selected_Press"
+			label="Destinations"
+			layout="topleft"
+			left="0"
+			name="destination_btn"
+			tool_tip="Shows people window"
+			top="5"
+			is_toggle="true"
+			use_ellipses="true"
+			width="100">
+				<bottomtray_button.commit_callback
+				  function="Destination.show" />
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
+		  auto_resize="false"
+		  follows="left|right"
+		  height="28"
+		  layout="topleft"
+		  min_height="28"
+		  min_width="73"
+		  mouse_opaque="false"
+		  name="avatar_and_destinations_panel"
+		  user_resize="false"
+		  width="103">
+			<bottomtray_button
+			 can_drag="false"
+			follows="left|right"
+			height="23"
+			image_pressed="PushButton_Press"
+			image_pressed_selected="PushButton_Selected_Press"
+			image_selected="PushButton_Selected_Press"
+			label="My Avatar"
+			layout="topleft"
+			left="0"
+			name="avatar_btn"
+			top="5"
+			is_toggle="true"
+			use_ellipses="true"
+			width="100">
+				<bottomtray_button.commit_callback
+				  function="Avatar.show" />
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
+		  auto_resize="false"
+		  follows="left|right"
+		  height="28"
+		  layout="topleft"
+		  min_width="17"
+		  name="splitter_panel"
+		  user_resize="false"
+		  width="17">
+			<icon
              follows="left|bottom"
              height="18"
-             width="2" 
-             left="6" 
-             image_name="Button_Separator" 
-             name="separator" 
+             width="2"
+             left="6"
+             image_name="Button_Separator"
+             name="separator"
              top="7"/>
-        </layout_panel>
-        <layout_panel
+		</layout_panel>
+		<layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -227,106 +232,106 @@
          top_delta="0"
          user_resize="false"
          width="105">
-          <bottomtray_button
-             can_drag="false"
-            follows="left|right"
-            height="23"
-            image_pressed="PushButton_Press"
-            image_pressed_selected="PushButton_Selected_Press"
-            image_selected="PushButton_Selected_Press"
-            label="People"
-            layout="topleft"
-            left="0"
-            name="show_people_button"
-            tool_tip="Shows people window"
-            top="5"
-            is_toggle="true"
-            use_ellipses="true"
-            width="100">
-            <bottomtray_button.commit_callback
-              function="ShowSidetrayPanel"
-             parameter="panel_people" />
-          </bottomtray_button>
-        </layout_panel>
-      <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="65"
-         mouse_opaque="false"
-         name="profile_panel"
-         top_delta="0"
-         user_resize="false"
-         width="105">
-          <bottomtray_button
-             can_drag="false"
-            follows="left|right"
-            height="23"
-            image_pressed="PushButton_Press"
-            image_pressed_selected="PushButton_Selected_Press"
-            image_selected="PushButton_Selected_Press"
-            label="Profile"
-            layout="topleft"
-            left="0"
-            name="show_profile_btn"
-            tool_tip="Shows profile window"
-            is_toggle="true" 
-            top="5"
-            use_ellipses="true"
-            width="100">
-            <bottomtray_button.commit_callback
-              function="ToggleAgentProfile"
-              parameter="agent"/>
-          </bottomtray_button>
-        </layout_panel>
-      <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="65"
-         mouse_opaque="false"
-         name="howto_panel"
-         top_delta="0"
-         user_resize="false"
-         width="105">
-        <bottomtray_button
-           can_drag="false"
-          follows="left|right"
-          height="23"
-          image_pressed="PushButton_Press"
-          image_pressed_selected="PushButton_Selected_Press"
-          image_selected="PushButton_Selected_Press"
-          label="How To"
-          layout="topleft"
-          left="0"
-          name="show_help_btn"
-          tool_tip="Open Second Life How To topics"
-          is_toggle="true"
-          top="5"
-          use_ellipses="true"
-          width="100">
-          <bottomtray_button.commit_callback
-            function="ToggleHelp"
-            parameter="f1_help" />
-          </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
+			<bottomtray_button
+			   can_drag="false"
+			  follows="left|right"
+			  height="23"
+			  image_pressed="PushButton_Press"
+			  image_pressed_selected="PushButton_Selected_Press"
+			  image_selected="PushButton_Selected_Press"
+			  label="People"
+			  layout="topleft"
+			  left="0"
+			  name="show_people_button"
+			  tool_tip="Shows people window"
+			  top="5"
+			  is_toggle="true"
+			  use_ellipses="true"
+			  width="100">
+				<bottomtray_button.commit_callback
+				  function="ShowSidetrayPanel"
+				 parameter="panel_people" />
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
+		   auto_resize="false"
+		   follows="right"
+		   height="28"
+		   layout="topleft"
+		   min_height="28"
+		   min_width="65"
+		   mouse_opaque="false"
+		   name="profile_panel"
+		   top_delta="0"
+		   user_resize="false"
+		   width="105">
+			<bottomtray_button
+			   can_drag="false"
+			  follows="left|right"
+			  height="23"
+			  image_pressed="PushButton_Press"
+			  image_pressed_selected="PushButton_Selected_Press"
+			  image_selected="PushButton_Selected_Press"
+			  label="Profile"
+			  layout="topleft"
+			  left="0"
+			  name="show_profile_btn"
+			  tool_tip="Shows profile window"
+			  is_toggle="true"
+			  top="5"
+			  use_ellipses="true"
+			  width="100">
+				<bottomtray_button.commit_callback
+				  function="ToggleAgentProfile"
+				  parameter="agent"/>
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
+		   auto_resize="false"
+		   follows="right"
+		   height="28"
+		   layout="topleft"
+		   min_height="28"
+		   min_width="65"
+		   mouse_opaque="false"
+		   name="howto_panel"
+		   top_delta="0"
+		   user_resize="false"
+		   width="105">
+			<bottomtray_button
+			   can_drag="false"
+			  follows="left|right"
+			  height="23"
+			  image_pressed="PushButton_Press"
+			  image_pressed_selected="PushButton_Selected_Press"
+			  image_selected="PushButton_Selected_Press"
+			  label="How To"
+			  layout="topleft"
+			  left="0"
+			  name="show_help_btn"
+			  tool_tip="Open Second Life How To topics"
+			  is_toggle="true"
+			  top="5"
+			  use_ellipses="true"
+			  width="100">
+				<bottomtray_button.commit_callback
+				  function="ToggleHelp"
+				  parameter="f1_help" />
+			</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_panel
              chiclet_padding="4"
              follows="left|right"
              height="24"
@@ -337,7 +342,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              name="chiclet_list"
              top="7"
              width="189">
-                <button
+				<button
                  auto_resize="true"
                  follows="right"
                  height="29"
@@ -354,7 +359,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                  top="-28"
                  visible="false"
                  width="7" />
-                <button
+				<button
                  auto_resize="true"
                  follows="right"
                  height="29"
@@ -371,13 +376,13 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                  top="-28"
                  visible="false"
                  width="7" />
-            </chiclet_panel>
-        </layout_panel>
-        <layout_panel auto_resize="false"
-                      user_resize="false" 
+			</chiclet_panel>
+		</layout_panel>
+		<layout_panel auto_resize="false"
+                      user_resize="false"
                       width="4"
                       min_width="4"/>
-        <layout_panel
+		<layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -388,7 +393,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          top="0"
          user_resize="false"
          width="37">
-            <chiclet_im_well
+			<chiclet_im_well
              follows="right"
              height="28"
              layout="topleft"
@@ -397,7 +402,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              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
@@ -405,7 +410,7 @@ image_selected          "Unlit" + "Selected" - there are no new messages and the
 image_pressed           "Lit" - there are new messages
 image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
              -->
-                <button
+				<button
                  auto_resize="true"
                  follows="right"
                  halign="center"
@@ -420,13 +425,13 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  name="Unread IM messages"
                  tool_tip="Conversations"
                  width="34">
-                    <init_callback
+					<init_callback
                      function="Button.SetDockableFloaterToggle"
                      parameter="im_well_window" />
-                </button>
-            </chiclet_im_well>
-        </layout_panel>
-        <layout_panel
+				</button>
+			</chiclet_im_well>
+		</layout_panel>
+		<layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -437,7 +442,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          top="0"
          user_resize="false"
          width="37">
-            <chiclet_notification
+			<chiclet_notification
              follows="right"
              height="23"
              layout="topleft"
@@ -446,7 +451,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              name="notification_well"
              top="5"
              width="35">
-                <button
+				<button
                  auto_resize="true"
                  bottom_pad="3"
                  follows="right"
@@ -462,17 +467,17 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  name="Unread"
                  tool_tip="Notifications"
                  width="34">
-                    <init_callback
+					<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>
+				</button>
+			</chiclet_notification>
+		</layout_panel>
+		<layout_panel
+		   auto_resize="false"
+		   user_resize="false"
+		   min_width="4"
+		   name="DUMMY2"
+		   width="8" />
+	</layout_stack>
 </panel>
-- 
cgit v1.2.3


From 6336022ada7811e9f36844d5f7ff660cb712fdfe Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 14 Mar 2011 17:49:11 -0700
Subject: SOCIAL-661 FIX Receiving Inventory notification in Basic Mode
 SOCIAL-654 FIX Items purchased on Marketplace.secondlife.com while logged
 into Minimal skin are declined and not present in inventory

---
 .../minimal/xui/en/notification_visibility.xml     |  2 -
 .../newview/skins/minimal/xui/en/notifications.xml | 44 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/minimal/xui/en/notifications.xml

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

diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
index 9d4836d328..616b544847 100644
--- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" ?>
 <notification_visibility>
-  <respond name="UserGiveItem" response="Discard"/>
-  <respond name="ObjectGiveItem" response="Discard"/>
   <respond name="VoiceInviteP2P" response="Decline"/>
   <respond name="VoiceInviteAdHoc" response="Decline"/>
   <respond name="VoiceInviteGroup" response="Decline"/>
diff --git a/indra/newview/skins/minimal/xui/en/notifications.xml b/indra/newview/skins/minimal/xui/en/notifications.xml
new file mode 100644
index 0000000000..84da9472cc
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/notifications.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<notifications>
+  <notification
+ icon="notify.tga"
+ name="UserGiveItem"
+ type="offer">
+    [NAME_SLURL] is offering you [ITEM_SLURL].  Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen.
+    <form name="form">
+      <button
+       index="4"
+       name="Show"
+       text="Keep Item"/>
+      <button
+       index="1"
+       name="Discard"
+       text="Reject Item"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Block User"/>
+    </form>
+  </notification>
+  <notification
+   icon="notify.tga"
+   name="ObjectGiveItem"
+   type="offer">
+    An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] is offering you [ITEM_SLURL].  Using this item requires you to switch to Advanced mode where you will find the item in your Inventory. To switch to Advanced mode, quit and restart this application and change the mode setting on the login screen.
+    <form name="form">
+      <button
+       index="0"
+       name="Keep"
+       text="Keep Item"/>
+      <button
+       index="1"
+       name="Discard"
+       text="Reject Item"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Block Object"/>
+    </form>
+  </notification>
+
+</notifications>
-- 
cgit v1.2.3