From 5e2b781e7886c3238645b5fcff9017ed960396e9 Mon Sep 17 00:00:00 2001
From: Twisted_Laws <none@none>
Date: Thu, 14 Apr 2011 08:11:06 -0400
Subject: STORM-1103 Nearby sidebar minimap should be optional

---
 .../xui/en/menu_people_nearby_view_sort.xml        |  8 ++++
 .../newview/skins/default/xui/en/panel_people.xml  | 51 ++++++++++++----------
 2 files changed, 37 insertions(+), 22 deletions(-)

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

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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 1a00416b2a..1869eec476 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -99,28 +99,35 @@ 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="topleft"
-             left="3"
-             multi_select="true"
-             name="avatar_list"
-             top="145"
-             width="306" />
-            <panel
+        <layout_stack orientation="vertical" clip="false" follows="all" layout="topleft" top="0" left="0" height="355" width="313" mouse_opaque="false">
+          <layout_panel layout="topleft" top="0" left="0" height="142" width="313" user_resize="false" mouse_opaque="false" visibility_control="NearbyListShowMap">
+          <net_map
+            bg_color="NetMapBackgroundColor"
+            follows="all"
+            layout="topleft"
+            left="3"
+            mouse_opaque="false"
+            name="Net Map"
+            width="305"
+            height="140"
+            top="4"/>
+          </layout_panel>
+          <layout_panel layout="topleft" height="213" min_height="100" width="313" user_resize="false" mouse_opaque="false">
+          <avatar_list
+            allow_select="true"
+            follows="all"
+            height="211"
+            ignore_online_status="true"
+            layout="topleft"
+            left="3"
+            multi_select="true"
+            keep_one_selected="false"
+            name="avatar_list"
+            top="2"
+            width="306" />
+          </layout_panel>
+        </layout_stack>
+        <panel
              background_visible="true"
              follows="left|right|bottom"
              height="27"
-- 
cgit v1.2.3


From c3e4fd975cd6ce7af9521143d469ec9f017d47dd Mon Sep 17 00:00:00 2001
From: Twisted_Laws <none@none>
Date: Fri, 15 Apr 2011 14:32:56 -0400
Subject: STORM-1103 Nearby sidebar minimap should be optional, changes from
 review

---
 .../newview/skins/default/xui/en/panel_people.xml  | 79 ++++++++++++++--------
 1 file changed, 49 insertions(+), 30 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 1869eec476..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,35 +99,54 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          name="nearby_panel"
          top="0"
          width="313">
-        <layout_stack orientation="vertical" clip="false" follows="all" layout="topleft" top="0" left="0" height="355" width="313" mouse_opaque="false">
-          <layout_panel layout="topleft" top="0" left="0" height="142" width="313" user_resize="false" mouse_opaque="false" visibility_control="NearbyListShowMap">
-          <net_map
-            bg_color="NetMapBackgroundColor"
-            follows="all"
-            layout="topleft"
-            left="3"
-            mouse_opaque="false"
-            name="Net Map"
-            width="305"
-            height="140"
-            top="4"/>
-          </layout_panel>
-          <layout_panel layout="topleft" height="213" min_height="100" width="313" user_resize="false" mouse_opaque="false">
-          <avatar_list
-            allow_select="true"
-            follows="all"
-            height="211"
-            ignore_online_status="true"
-            layout="topleft"
-            left="3"
-            multi_select="true"
-            keep_one_selected="false"
-            name="avatar_list"
-            top="2"
-            width="306" />
-          </layout_panel>
-        </layout_stack>
-        <panel
+         <layout_stack
+           clip="false"
+           follows="all"
+           height="355"
+           layout="topleft"
+           mouse_opaque="false"
+           orientation="vertical"
+           width="313">
+           <layout_panel
+             height="142"
+             layout="topleft"
+             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"
-- 
cgit v1.2.3


From bf8b02b1f31ac1b3959a537568b712fdf16d02e2 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 26 May 2011 09:17:14 -0400
Subject: STORM-899 'No attachments worn' text on blank 'Attachments' accordion
 remains in English for all locales

---
 indra/newview/skins/default/xui/en/panel_cof_wearables.xml | 3 ---
 indra/newview/skins/default/xui/en/strings.xml             | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

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

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/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f8c90106b7..f7599c70ff 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2092,6 +2092,8 @@ Requests name of an avatar.  When data is available the dataserver event will be
 	<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


From fa76b8992c6c636303d398bd25d34c39ae23419e Mon Sep 17 00:00:00 2001
From: Seraph Linden <none@none>
Date: Mon, 30 May 2011 16:49:43 -0400
Subject: SH-1592 FIXED Advanced model uploader needs an IP checkbox like the
 wizard uploader has

---
 .../newview/skins/default/xui/en/floater_model_preview.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index dce55dae12..4677d014b8 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -83,6 +83,20 @@
     </text>
   </panel>
 
+  <check_box
+	height="16"
+	left_delta="0"
+	name="confirm_checkbox"
+	top_pad="15"
+	follows="bottom|left"
+	width="16" />
+
+  <text
+	height="30"
+	width="570"
+	word_wrap="true" 
+	left_delta="25"
+	top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>
   <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
 
   
-- 
cgit v1.2.3


From faef58a9b91ecbbffd93fa90347f1b8bd5856902 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 2 Jun 2011 01:36:28 -0500
Subject: SH-1666 Remove "Mesh" stitching type from sculpt combo box.

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 40bf7bfed7..f5f6b990d1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2098,11 +2098,7 @@ even though the user gets a free copy.
                  label="Cylinder"
                  name="Cylinder"
                  value="Cylinder" />
-              <combo_box.item
-                 label="Mesh"
-                 name="Mesh"
-                 value="Mesh" />
-            </combo_box>
+              </combo_box>
         </panel>
         <panel
          border="false"
-- 
cgit v1.2.3


From dbd619508ba45292c2cebe096494c28e74941643 Mon Sep 17 00:00:00 2001
From: prep linden <prep@lindenlab.com>
Date: Tue, 7 Jun 2011 16:53:29 -0400
Subject: Fix for importer crashes, sh-1698. Added checks for handling bad
 elements in the dae.

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 1 +
 indra/newview/skins/default/xui/en/floater_model_wizard.xml  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 4677d014b8..9d46e1eec5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -7,6 +7,7 @@
   <string name="status_reading_file">Loading...</string>
   <string name="status_generating_meshes">Generating Meshes...</string>
   <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+  <string name="bad_element">Error: element is invalid</string>
   <string name="high">High</string>
   <string name="medium">Medium</string>
   <string name="low">Low</string>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 47b2e5fd79..3dd16f8eb1 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -1021,7 +1021,8 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 	<string name="status_idle">Idle</string>
 	<string name="status_reading_file">Loading...</string>
 	<string name="status_generating_meshes">Generating Meshes...</string>
-  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+	<string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+	<string name="bad_element">Error: element is invalid</string>
 	<string name="high">High</string>
 	<string name="medium">Medium</string>
 	<string name="low">Low</string>
-- 
cgit v1.2.3


From 0c3de98056bde49a18c40469b3d3e3a43be3d209 Mon Sep 17 00:00:00 2001
From: paul_productengine <none@none>
Date: Wed, 8 Jun 2011 18:23:31 +0300
Subject: SH-1588 FIXED (Build tools does not specify units for prim density
 value) - Changed label of the Density spinner - Added ability to LLSpinCtrl
 to set wrap property form XML

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index f5f6b990d1..7441b2cd9c 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2457,8 +2457,9 @@ even though the user gets a free copy.
              height="19"
              increment="0.1"
              initial_value="0"
-             label="Density"
+             label="Density in 100 kg/m^3"
              label_width="70"
+             label_wrap="true"
              layout="topleft"
              left_delta="0"
              max_val="22587"
@@ -2479,7 +2480,7 @@ even though the user gets a free copy.
              max_val="1"
              min_val="0"
              name="Physics Restitution"
-             top_pad="4"
+             top_pad="8"
              width="132" />
         </panel>
          <panel
-- 
cgit v1.2.3


From cd7de2dfe7b837a7000e05606793cbbaec4d475e Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 8 Jun 2011 15:29:52 -0400
Subject: Fix for sh-815: Added support for verifying a controllers skin weight
 count against the geometries vertex count

---
 indra/newview/skins/default/xui/en/floater_model_preview.xml | 1 +
 indra/newview/skins/default/xui/en/floater_model_wizard.xml  | 1 +
 2 files changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 9d46e1eec5..f58595b3c5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -4,6 +4,7 @@
      name="Model Preview" title="Upload Model" width="620">
 
   <string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
   <string name="status_reading_file">Loading...</string>
   <string name="status_generating_meshes">Generating Meshes...</string>
   <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 3dd16f8eb1..8603682e3a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -1019,6 +1019,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
 
 	<string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
 	<string name="status_reading_file">Loading...</string>
 	<string name="status_generating_meshes">Generating Meshes...</string>
 	<string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
-- 
cgit v1.2.3


From 3317c7f71424b70b701d4bba8db704b56e47b13c Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Wed, 8 Jun 2011 14:18:27 -0700
Subject: FIX VWR-24121 en_xui_change

---
 indra/newview/skins/default/xui/en/floater_sell_land.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 38b305db7e..52de9ddd47 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -177,7 +177,8 @@
      font="SansSerif"
      height="16"
      left="30"
-     name="sell_objects_label">
+     name="sell_objects_label"
+     width="266">
         3. Sell the objects with the land?
     </text>
     <text
-- 
cgit v1.2.3


From ac504815137ec01767717e7c1a4c419a995f629c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 12 Jun 2011 16:00:33 -0400
Subject: STORM-787 Mute Gestures Button

---
 .../default/xui/en/panel_preferences_sound.xml     | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

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

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..1bdd2ccefb 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"
@@ -311,6 +314,17 @@
 		name="enable_voice_check"
 		width="110"/>
 	<!-- -->
+	<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="Enable sounds from gestures"
+		top_pad="1"
+		left="25"/>
 	<check_box
 		name="media_auto_play_btn"
 		control_name="ParcelMediaAutoPlayEnable"
-- 
cgit v1.2.3


From 8c998c5e8f6fee10e8bb96148db423a4020dd675 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 12 Jun 2011 19:59:06 -0400
Subject: STORM-787 Mute Gestures Button

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

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

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 1bdd2ccefb..baa8d485ef 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -322,7 +322,7 @@
 		follows="left|bottom|right"
 		height="15"
 		tool_tip="Check this to hear sounds from gestures"
-		label="Enable sounds from gestures"
+		label="Play sounds from gestures"
 		top_pad="1"
 		left="25"/>
 	<check_box
-- 
cgit v1.2.3


From 0c8b3ea7448a9da069d20fdf3d48a6feec7eb33f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Mon, 13 Jun 2011 18:35:46 -0400
Subject: STORM-787 Mute Gestures Button--moved check box down 2 lines

---
 .../default/xui/en/panel_preferences_sound.xml     | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

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

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 baa8d485ef..1745c1e4b0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -314,17 +314,6 @@
 		name="enable_voice_check"
 		width="110"/>
 	<!-- -->
-	<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"/>
 	<check_box
 		name="media_auto_play_btn"
 		control_name="ParcelMediaAutoPlayEnable"
@@ -346,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"
-- 
cgit v1.2.3


From 6532d5db2dc450295d7ee4272600aaf79188ebc1 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 15 Jun 2011 18:38:30 -0400
Subject: SH-1166 WIP

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/notifications.xml

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
old mode 100644
new mode 100755
index ce96c488b4..c8d1d6c9fd
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6823,7 +6823,7 @@ Select residents to share with.
     name="MeshUploadError"
     icon="alert.tga"
     type="alert">
-    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] 
   </notification>
    
   <notification
-- 
cgit v1.2.3


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/newview/skins/default/xui/en')

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


From cc6e80412949639f52138adde5b909a298cd2242 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 16 Jun 2011 15:58:34 -0400
Subject: SH-1166 FIX

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c8d1d6c9fd..09105c1d28 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6824,6 +6824,8 @@ Select residents to share with.
     icon="alert.tga"
     type="alert">
     [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] 
+
+See the log file for details.
   </notification>
    
   <notification
-- 
cgit v1.2.3


From 6575258ff961bb534ee26813f5f2601e792dedc9 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Fri, 17 Jun 2011 11:39:56 -0700
Subject: FIX VWR-25068 en_xui_change

---
 .../newview/skins/default/xui/en/floater_preview_gesture.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 9f6199fada..478ae5f53f 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -50,17 +50,17 @@
      name="desc_label"
      top_pad="25"
      font.style="BOLD"
-     width="100">
+     width="105">
         Description:
     </text>
     <line_editor
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="89"
+     left_delta="94"
      name="desc"
      top_delta="-4"
-     width="175" />
+     width="170" />
     <text
      type="string"
      length="1"
@@ -96,19 +96,19 @@
      name="replace_text"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!"
      top_pad="10"
-     width="210">
+     width="215">
         Replace with:
     </text>
     <line_editor
      follows="left|top"
      height="20"
      layout="topleft"
-     left_delta="99"
+     left_delta="104"
      max_length_bytes="31"
      name="replace_editor"
      tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"
      top_delta="-4"
-     width="165" />
+     width="160" />
     <text
      type="string"
      length="1"
-- 
cgit v1.2.3


From 47c49b5bc564675b4e4b5c21f3c5ea0005980ae6 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Mon, 20 Jun 2011 11:22:02 -0700
Subject: sync with viewer-development

---
 .../skins/default/xui/en/floater_model_preview.xml       | 16 ++++++++++++++++
 .../skins/default/xui/en/floater_model_wizard.xml        |  4 +++-
 indra/newview/skins/default/xui/en/floater_tools.xml     | 11 ++++-------
 indra/newview/skins/default/xui/en/notifications.xml     |  4 +++-
 4 files changed, 26 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index dce55dae12..f58595b3c5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -4,9 +4,11 @@
      name="Model Preview" title="Upload Model" width="620">
 
   <string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
   <string name="status_reading_file">Loading...</string>
   <string name="status_generating_meshes">Generating Meshes...</string>
   <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+  <string name="bad_element">Error: element is invalid</string>
   <string name="high">High</string>
   <string name="medium">Medium</string>
   <string name="low">Low</string>
@@ -83,6 +85,20 @@
     </text>
   </panel>
 
+  <check_box
+	height="16"
+	left_delta="0"
+	name="confirm_checkbox"
+	top_pad="15"
+	follows="bottom|left"
+	width="16" />
+
+  <text
+	height="30"
+	width="570"
+	word_wrap="true" 
+	left_delta="25"
+	top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text>
   <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text>
 
   
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 47b2e5fd79..8603682e3a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -1019,9 +1019,11 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
 
 	<string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
 	<string name="status_reading_file">Loading...</string>
 	<string name="status_generating_meshes">Generating Meshes...</string>
-  <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+	<string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
+	<string name="bad_element">Error: element is invalid</string>
 	<string name="high">High</string>
 	<string name="medium">Medium</string>
 	<string name="low">Low</string>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 40bf7bfed7..7441b2cd9c 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2098,11 +2098,7 @@ even though the user gets a free copy.
                  label="Cylinder"
                  name="Cylinder"
                  value="Cylinder" />
-              <combo_box.item
-                 label="Mesh"
-                 name="Mesh"
-                 value="Mesh" />
-            </combo_box>
+              </combo_box>
         </panel>
         <panel
          border="false"
@@ -2461,8 +2457,9 @@ even though the user gets a free copy.
              height="19"
              increment="0.1"
              initial_value="0"
-             label="Density"
+             label="Density in 100 kg/m^3"
              label_width="70"
+             label_wrap="true"
              layout="topleft"
              left_delta="0"
              max_val="22587"
@@ -2483,7 +2480,7 @@ even though the user gets a free copy.
              max_val="1"
              min_val="0"
              name="Physics Restitution"
-             top_pad="4"
+             top_pad="8"
              width="132" />
         </panel>
          <panel
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ce96c488b4..09105c1d28 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6823,7 +6823,9 @@ Select residents to share with.
     name="MeshUploadError"
     icon="alert.tga"
     type="alert">
-    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+    [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] 
+
+See the log file for details.
   </notification>
    
   <notification
-- 
cgit v1.2.3


From c0fa40141b576ee40f016d27a8f02a08e6d49446 Mon Sep 17 00:00:00 2001
From: eli_linden <none@none>
Date: Tue, 21 Jun 2011 16:15:58 -0700
Subject: FIX VWR-25160 en_xui_change

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 9bd60b935f..bfc503f05b 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -104,12 +104,12 @@
 		top_pad="15"
 		left="10"
 		name="show_text"
-		width="40">
+		width="62">
 	  Show:
 	</text>
 	<combo_box
 		height="23"
-		left="50"
+		left="72"
 		width="140"
 		top_delta="-5"
 		follows="left|top"
-- 
cgit v1.2.3