From 9d0351550eb94e6bf4a925928c5433de3904b7e9 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Thu, 16 Jun 2011 12:32:30 -0700
Subject: sync with viewer-development

---
 .../xui/en/menu_people_nearby_view_sort.xml        |  8 +++
 .../skins/default/xui/en/panel_cof_wearables.xml   |  3 -
 .../newview/skins/default/xui/en/panel_people.xml  | 70 +++++++++++++++-------
 .../default/xui/en/panel_preferences_sound.xml     | 23 +++++--
 indra/newview/skins/default/xui/en/strings.xml     |  2 +
 5 files changed, 76 insertions(+), 30 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index f9db64b524..65bd2793b6 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -42,6 +42,14 @@
      function="CheckControl"
      parameter="NearbyListShowIcons" />
   </menu_item_check>
+  <menu_item_check name ="view_map" label="View Map">
+    <menu_item_check.on_check
+      function="CheckControl"
+      parameter="NearbyListShowMap" />
+    <menu_item_check.on_click
+      function="ToggleControl"
+      parameter="NearbyListShowMap" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index f438e3d42d..bbeb592e96 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -53,9 +53,6 @@
              name="list_attachments"
              top="0"
              width="311">
-              <flat_list_view.no_items_text
-               value="No attachments worn" />
-              </flat_list_view>
         </accordion_tab>
         <accordion_tab
          layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 1a00416b2a..775805ad2e 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -87,7 +87,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      width="319">
      	<panel
          background_opaque="true"
-       background_visible="true"
+         background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
          follows="all"
@@ -99,28 +99,54 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          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="305"
-			 height="140"
-			 top="5"/>
-			<avatar_list
-             allow_select="true"
-             follows="top|left|bottom|right"
-             height="211"
-             ignore_online_status="true"
+         <layout_stack
+           clip="false"
+           follows="all"
+           height="355"
+           layout="topleft"
+           mouse_opaque="false"
+           orientation="vertical"
+           width="313">
+           <layout_panel
+             height="142"
              layout="topleft"
-             left="3"
-             multi_select="true"
-             name="avatar_list"
-             top="145"
-             width="306" />
-            <panel
+             mouse_opaque="false"
+             user_resize="false"
+             visibility_control="NearbyListShowMap"
+             width="313">
+             <net_map
+               bg_color="NetMapBackgroundColor"
+               follows="all"
+               height="140"
+               layout="topleft"
+               left="3"
+               mouse_opaque="false"
+               name="Net Map"
+               top="4"
+               width="305"/>
+           </layout_panel>
+           <layout_panel
+             height="213"
+             layout="topleft"
+             min_height="100"
+             mouse_opaque="false"
+             user_resize="false"
+             width="313">
+             <avatar_list
+               allow_select="true"
+               follows="all"
+               height="211"
+               ignore_online_status="true"
+               layout="topleft"
+               left="3"
+               keep_one_selected="false"
+               multi_select="true"
+               name="avatar_list"
+               top="2"
+               width="306" />
+           </layout_panel>
+         </layout_stack>
+         <panel
              background_visible="true"
              follows="left|right|bottom"
              height="27"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 91fe6f544c..1745c1e4b0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -123,8 +123,8 @@
          function="Pref.setControlFalse"
          parameter="MuteAmbient" />
     </slider>
-        <button
-    control_name="MuteAmbient"
+    <button
+     control_name="MuteAmbient"
      disabled_control="MuteAudio"
      follows="top|left"
      height="16"
@@ -157,7 +157,7 @@
          function="Pref.setControlFalse"
          parameter="MuteSounds" />
     </slider>
-   <button
+    <button
      control_name="MuteSounds"
      disabled_control="MuteAudio"
      follows="top|left"
@@ -169,7 +169,10 @@
      left_pad="5"
      name="mute_audio"
      tab_stop="false"
-     width="16" />
+     width="16">
+      <button.commit_callback
+      function="Pref.SetSounds"/>
+    </button>
     <slider
      control_name="AudioLevelMusic"
      disabled_control="MuteAudio"
@@ -332,7 +335,17 @@
 		label="Play media attached to other avatars"
 		left="25"
     width="230"/>
-
+	<check_box
+		name="gesture_audio_play_btn"
+		control_name="EnableGestureSounds"
+        disabled_control="MuteAudio"
+		value="true"
+		follows="left|bottom|right"
+		height="15"
+		tool_tip="Check this to hear sounds from gestures"
+		label="Play sounds from gestures"
+		top_pad="1"
+		left="25"/>
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 339f14eacb..71f48c833d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2101,6 +2101,8 @@ Returns a string with the requested data about the region
 	<string name="InvFolder Friends">Friends</string>
 	<string name="InvFolder All">All</string>
 
+	<string name="no_attachments">No attachments worn</string>
+
 	<!-- inventory FVBridge -->
 	<!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
 	<string name="Buy">Buy</string>
-- 
cgit v1.2.3