From 3e5f5a205034cde29ef80a9230d8cd4867e6dec5 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 11 Jan 2010 14:41:37 -0800
Subject: EXT-3444 	Volume control slider appears in an odd location

reviewed by Leyla
---
 .../skins/default/xui/en/panel_status_bar.xml      |  1 -
 .../skins/default/xui/en/panel_volume_pulldown.xml | 55 ++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_volume_pulldown.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 00f54feabd..5c9c9b5611 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -84,7 +84,6 @@
      tool_tip="Global Volume Control"
      width="16" />
     <text
-     enabled="true"
      follows="right|bottom"
      halign="center"
      height="12"
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
new file mode 100644
index 0000000000..60d4a7e00b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="false"
+ border_visible="false"
+ border="false"
+ chrome="true" 
+ follows="bottom"
+ height="150"
+ layout="topleft"
+ name="volumepulldown_floater"
+ width="32">
+  <!-- floater background image -->
+  <icon
+   height="150"
+   image_name="Inspector_Background"
+   layout="topleft"
+   left="0"
+   name="normal_background"
+   top="0"
+   width="32" />
+ <slider
+  control_name="AudioLevelMaster"
+  follows="left|top"
+  left="0"
+  top="1"
+  orientation="vertical"
+  height="120"
+  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>
+  <button
+    left="7"
+    top_pad="9"
+    width="18"
+    height="12"
+    follows="top|left"
+    name="prefs_btn"
+    image_unselected="Icon_Gear_Foreground"
+    image_disabled="Icon_Gear_Background"
+    image_pressed="Icon_Gear_Press"
+    scale_image="false">
+    <button.commit_callback
+       function="Vol.GoAudioPrefs" />
+  </button>
+</panel>
-- 
cgit v1.2.3


From 2aaa7971945823f53f0a01028036c37361bcfa17 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 11 Jan 2010 15:36:02 -0800
Subject: ext-4050 - nearby chat title bar missing background art

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 920f0c909a..ae686d9ab7 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -4,8 +4,8 @@
  border_drop_shadow_visible="false"
  drop_shadow_visible="false"
  border="false"
- bg_opaque_image="Inspector_Background"
- bg_alpha_image="Toast_Background"
+ bg_opaque_image="Window_Foreground" 
+ bg_alpha_image="Window_Background" 
  bg_alpha_color="0 0 0 0"
  legacy_header_height="18"
  can_minimize="true"
-- 
cgit v1.2.3


From a94b6b26e9681775b4ba247fba4950e0ffd990c0 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Mon, 11 Jan 2010 17:19:41 -0800
Subject: Removing old art assets

---
 indra/newview/skins/default/textures/textures.xml  |  8 +----
 indra/newview/skins/default/xui/en/menu_viewer.xml | 36 +---------------------
 .../skins/default/xui/en/panel_status_bar.xml      |  1 +
 3 files changed, 3 insertions(+), 42 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index dab11149b9..83121e73c8 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -224,7 +224,7 @@ with the same filename but different name
            scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" />
   <texture name="Inspector_Hover" file_name="windows/Inspector_Hover.png" preload="false" />
   <texture name="Inspector_I" file_name="windows/Inspector_I.png" preload="false" />
-  
+
   <texture name="Inv_Acessories" file_name="icons/Inv_Accessories.png" preload="false" />
   <texture name="Inv_Alpha" file_name="icons/Inv_Alpha.png" preload="false" />
   <texture name="Inv_Animation" file_name="icons/Inv_Animation.png" preload="false" />
@@ -676,8 +676,6 @@ with the same filename but different name
 
   <texture name="toggle_button_off" file_name="toggle_button_off.png" preload="true" />
   <texture name="toggle_button_selected" file_name="toggle_button_selected.png" preload="true" />
-
-  <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4" />
   <texture name="color_swatch_alpha.tga" preload="true" />
 
   <texture name="button_anim_pause.tga" />
@@ -715,10 +713,6 @@ with the same filename but different name
   <texture name="map_telehub.tga" />
   <texture name="map_track_16.tga" />
 
-  <texture name="media_icon.tga" file_name="icn_label_media.tga" />
-  <texture name="music_icon.tga" file_name="icn_label_music.tga" />
-
-  <texture name="notify_tip_icon.tga" />
   <texture name="notify_caution_icon.tga" />
   <texture name="notify_next.png" preload="true" />
   <texture name="notify_box_icon.tga" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index fa7e3e86a3..45100eb1ff 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -198,40 +198,6 @@
              function="Floater.Toggle"
              parameter="nearby_media" />
         </menu_item_check>
-        <!--menu_item_check
-         label="Block List"
-         layout="topleft"
-         name="Mute List">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="mute" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="mute" />
-        </menu_item_check-->
-        <menu_item_separator
-         layout="topleft" />
-        <menu_item_check
-         label="(Legacy) Communicate"
-         layout="topleft"
-         name="Instant Message"
-         shortcut="control|T">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="communicate" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="communicate" />
-        </menu_item_check>
-        <menu_item_call
-         label="(Temp) Media Remote Ctrl"
-         layout="topleft"
-         name="Preferences"
-         shortcut="control|alt|M">
-            <menu_item_call.on_click
-             function="Floater.Toggle"
-             parameter="media_remote_ctrl" />
-        </menu_item_call>
     </menu>
     <menu
      label="World"
@@ -283,7 +249,7 @@
             </menu_item_call>
       <menu
            create_jump_keys="true"
-           label="About This Place"
+           label="Place Profile"
            layout="topleft"
            name="Land"
            tear_off="true">
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 00f54feabd..bbde47d2e1 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -42,6 +42,7 @@
     <button
      auto_resize="true"
      halign="right"
+     font="SansSerifSmall"
      follows="right|top"
      image_selected="BuyArrow_Over"
      image_unselected="BuyArrow_Over"
-- 
cgit v1.2.3


From 145dd30b9aaf6d2f53c606f5b0f30d3aefc1024b Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 11 Jan 2010 19:00:52 -0800
Subject: EXT-4032 - remove extra space in voice control panel

to be reviewed by Erica
---
 .../default/xui/en/floater_voice_controls.xml      | 137 ++++++++-------------
 1 file changed, 51 insertions(+), 86 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index b9649e9c57..c4a51bcff0 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -5,7 +5,7 @@
  can_close="false"
  height="270"
  layout="topleft"
- min_height="122"
+ min_height="280"
  min_width="190"
  name="floater_voice_controls"
  help_topic="floater_voice_controls"
@@ -37,23 +37,23 @@
      name="max_visible_items">
         5
     </string>
-    <panel
-     bevel_style="out"
-     border="true"
-     follows="left|right|top"
-     height="62"
-     layout="topleft"
-     left="0"
-     name="control_panel"
-     top="0"
-     width="282">
-        <panel
-         height="18"
-         follows="top|left|right"
+      <layout_stack
+         clip="false"
+         follows="all"
+         height="262"
          layout="topleft"
          left="10"
-         name="my_panel"
+         mouse_opaque="false"
+         name="my_call_stack"
+         orientation="vertical"
          width="263">
+        <layout_panel
+         follows="top|left|right"
+          user_resize="false" 
+         auto_resize="false" 
+         layout="topleft"
+         height="26"
+         name="my_panel">
             <avatar_icon
              enabled="false"
              follows="left|top"
@@ -79,92 +79,57 @@
             <output_monitor
              auto_update="true"
              draw_border="false"
-             follows="right"
+             follows="top|right"
              height="16"
              layout="topleft"
              name="speaking_indicator"
-             right="-1"
-             top="2"
+             left_pad="5"
              visible="true"
              width="20" />
-        </panel>
-        <layout_stack
-         border_size="0"
-         clip="false"
-         follows="all"
-         height="28"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="leave_call_stack"
-         orientation="horizontal"
-         top_pad="5"
-         width="263">
-         <layout_panel
-          auto_resize="true"
-          follows="left|right"
-          height="26"
-          layout="topleft"
-          min_height="23"
-          min_width="5"
-          mouse_opaque="false"
-          name="left_anchor"
-          width="80"/>
+        </layout_panel>
          <layout_panel
           auto_resize="false"
-          follows="left|right"
+          user_resize="false" 
+          follows="top|left"
           height="26"
+          visible="true"
           layout="topleft"
-          mouse_opaque="false"
-          min_height="24"
-          min_width="100"
           name="leave_call_btn_panel"
           width="100">
            <button
-            follows="left|right"
-            height="24"
+          follows="right|top"
+            height="23"
+            top_pad="0"
             label="Leave Call"
-            left="0"
             name="leave_call_btn"
-            top="0"
             width="100" />
          </layout_panel>
-         <layout_panel
-         auto_resize="true"
-         follows="left|right"
-         height="26"
+      <layout_panel
+          follows="all"
+          layout="topleft"
+          left="2"
+          top_pad="0"
+          height="205" 
+          name="callers_panel"
+          user_resize="false" 
+          width="280">
+        <avatar_list
+         follows="all"
+         height="205"
+         ignore_online_status="true"
          layout="topleft"
-         mouse_opaque="false"
-         min_height="24"
-         min_width="5"
-         name="right_anchor"
-         width="80"/>
-        </layout_stack>
-    </panel>
-    <avatar_list
-     follows="all"
-     height="197"
-     ignore_online_status="true"
-     layout="topleft"
-     left="0"
-     multi_select="true"
-     name="speakers_list"
-     width="282" />
-    <panel
-     filename="panel_avatar_list_item.xml"
-     follows="left|right|top"
-     height="24"
-     layout="topleft"
-     left="0"
-     name="non_avatar_caller"
-     top="70"
-     width="282" />
-    <view_border
-     bevel_style="out"
-     follows="left|top|right|bottom"
-     height="206"
-     layout="topleft"
-     left="0"
-     top="63"
-     width="282" />
+         multi_select="true"
+         name="speakers_list"
+         width="280" />
+        <panel
+         filename="panel_avatar_list_item.xml"
+         follows="left|right|top"
+         height="24"
+         layout="topleft"
+         left="0"
+         name="non_avatar_caller"
+         top="10"
+         width="276" />
+      </layout_panel>
+    </layout_stack>
 </floater>
-- 
cgit v1.2.3


From 2b2579cf1eaae860c9c288d921e29336364a4b0a Mon Sep 17 00:00:00 2001
From: "angela@angelas-macbook-pro.local" <angela@angelas-macbook-pro.local>
Date: Tue, 12 Jan 2010 11:03:28 +0800
Subject:   EXT-1645  [BSI] Selection Beam color preference (My Effects) isn't
 remembered after re-log  EXT-1644 [BSI] Selection Beam color preference (My
 Effects) doesn't honor color choice -- reviewed by richard

---
 .../skins/default/xui/en/panel_preferences_general.xml    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index c98555735a..22c75a595e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -260,7 +260,7 @@
      width="200">
         My effects:
     </text>
-  <text
+    <text
       type="string"
       length="1"
       follows="left|top"
@@ -270,16 +270,23 @@
       name="title_afk_text"
       width="190">
     Away timeout:
-  </text>
+    </text>
     <color_swatch
-     control_name="EffectColor"
+	 can_apply_immediately="true"
      follows="left|top"
      height="50"
      layout="topleft"
      left="50"
      name="effect_color_swatch"
      tool_tip="Click to open Color Picker"
-     width="38" />
+     width="38">
+		<color_swatch.init_callback
+		 function="Pref.getUIColor"
+		 parameter="EffectColor" />
+		<color_swatch.commit_callback
+		 function="Pref.applyUIColor"
+		 parameter="EffectColor" />
+	</color_swatch>
   <combo_box
             height="23"
             layout="topleft"
-- 
cgit v1.2.3


From dcc988fa3f151cce371296a5e21ffab0f0879e5c Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Mon, 11 Jan 2010 19:08:35 -0800
Subject: EXT-3799 Navbar cleanup to match spec - favorites height, vertical
 and horizontal alignment, volume button art, removed old art assets

---
 indra/newview/skins/default/textures/textures.xml  | 20 ++++---------
 .../skins/default/xui/en/panel_navigation_bar.xml  |  4 +--
 .../skins/default/xui/en/panel_status_bar.xml      | 34 ++++++++++++++++------
 .../default/xui/en/widgets/location_input.xml      | 16 +++++-----
 4 files changed, 41 insertions(+), 33 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 83121e73c8..ef6df7df1b 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -648,6 +648,12 @@ with the same filename but different name
   <texture name="PowerOff_Over" file_name="icons/PowerOff_Over.png" preload="false" />
   <texture name="PowerOff_Press" file_name="icons/PowerOff_Press.png" preload="false" />
 
+  <texture name="pixiesmall.j2c" use_mips="true" />
+  <texture name="script_error.j2c" use_mips="true" />
+  <texture name="silhouette.j2c" use_mips="true" />
+  <texture name="foot_shadow.j2c" use_mips="true" />
+  <texture name="cloud-particle.j2c" use_mips="true" />
+
   <!--WARNING OLD ART BELOW *do not use*-->
   <texture name="icn_chatbar.tga" />
   <texture name="icn_media_web.tga" preload="true" />
@@ -694,7 +700,6 @@ with the same filename but different name
   <texture name="icon_event_mature.tga" />
   <texture name="icon_for_sale.tga" />
   <texture name="icon_place_for_sale.tga" />
-  <texture name="icon_popular.tga" />
   <texture name="icon_top_pick.tga" />
 
   <texture name="lag_status_critical.tga" />
@@ -717,19 +722,6 @@ with the same filename but different name
   <texture name="notify_next.png" preload="true" />
   <texture name="notify_box_icon.tga" />
 
-  <texture name="pixiesmall.j2c" use_mips="true" />
-  <texture name="script_error.j2c" use_mips="true" />
-  <texture name="silhouette.j2c" use_mips="true" />
-  <texture name="foot_shadow.j2c" use_mips="true" />
-  <texture name="cloud-particle.j2c" use_mips="true" />
-
-  <texture name="status_no_build.tga" />
-  <texture name="status_voice.tga" />
-  <texture name="status_no_fly.tga" />
-  <texture name="status_health.tga" />
-  <texture name="status_no_push.tga" />
-  <texture name="status_no_scripts.tga" />
-
   <texture name="icn_active-speakers-dot-lvl0.tga" />
   <texture name="icn_active-speakers-dot-lvl1.tga" />
   <texture name="icn_active-speakers-dot-lvl2.tga" />
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index e2884dbedc..9ad99b1f13 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -47,7 +47,7 @@
 	     left="10"
 	     name="back_btn"
 	     tool_tip="Go back to previous location"
-	     top="3"
+	     top="2"
 	     width="31" />
 	    <button
 	     follows="left|top"
@@ -92,7 +92,6 @@
 	         width="20" />
 	      -->
 	    </location_input>
-
 	<!--     <button -->
 	<!--      follows="right|top" -->
 	<!--      height="20" -->
@@ -108,7 +107,6 @@
 	<!--      name="search_bg" -->
 	<!--      top_delta="0" -->
 	<!--      width="168" /> -->
-
         <search_combo_box
 	     bevel_style="none"
 	     border_style="line"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index bbde47d2e1..420a6eb173 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -39,6 +39,22 @@
      name="buycurrencylabel">
         L$ [AMT]
     </panel.string>
+    <button
+     auto_resize="true"
+     halign="right"
+     font="SansSerifSmall"
+     follows="right|top"
+     image_overlay=""
+     image_selected="spacer35.tga"
+     image_unselected="spacer35.tga"
+     image_pressed="spacer35.tga"
+     height="16"
+     right="-228"
+     label_shadow="false"
+     name="buycurrency"
+     tool_tip="My Balance"
+     top="5"
+     width="100" />
     <button
      auto_resize="true"
      halign="right"
@@ -48,13 +64,14 @@
      image_unselected="BuyArrow_Over"
      image_pressed="BuyArrow_Press"
      height="16"
-     right="-128"
-     label_color="White"
+     label="Buy L$"
+     label_color="EmphasisColor"
+     left_pad="0"
      label_shadow="false"
-     name="buycurrency"
+     name="buyL"
      pad_right="20px"
-     tool_tip="My Balance: Click to buy more L$"
-     top="3"
+     tool_tip="Click to buy more L$"
+     top="5"
      width="100" />
     <text
      type="string"
@@ -63,24 +80,23 @@
      follows="right|bottom"
      halign="right"
      height="16"
-     top="4"
+     top="7"
      layout="topleft"
      left_pad="0"
      name="TimeText"
-     text_color="TimeTextColor"
      tool_tip="Current time (Pacific)"
      width="85">
         12:00 AM
     </text>
     <button
      follows="right|bottom"
-     height="16"
+     height="15"
      image_selected="AudioMute_Off"
      image_pressed="Audio_Press"
      image_unselected="Audio_Off"
      is_toggle="true"
      left_pad="18"
-     top="1"
+     top="4"
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 67bb7c1896..0f1c8d0635 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -96,7 +96,7 @@
     name="damage_icon"
     width="14"
     height="13"
-    top="22"
+    top="25"
     left="2"
     follows="right|top"
     image_name="Parcel_Damage_Dark"
@@ -112,11 +112,13 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
-
-  <combo_button name="Location History"
-                          label=""
-                          pad_right="0"/>
-  <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"
+  <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="22"
@@ -124,5 +126,5 @@
                 font="SansSerifSmall"
                 bevel_style="none"
                 border_style="line"
-                border.border_thickness="0"/>
+                border.border_thickness="0" />
 </location_input>
-- 
cgit v1.2.3


From 2d9d3d5d8653176b82578578c8c44769a03b102d Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Tue, 12 Jan 2010 10:57:23 -0800
Subject: moved floater-specific setting to settings.xml frmo string embedded
 in floater

---
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index c4a51bcff0..c438d28236 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -3,9 +3,9 @@
  can_resize="true"
  can_minimize="true"
  can_close="false"
- height="270"
+ height="275"
  layout="topleft"
- min_height="280"
+ min_height="100"
  min_width="190"
  name="floater_voice_controls"
  help_topic="floater_voice_controls"
@@ -32,10 +32,6 @@
     <string
      name="no_one_near">
         No one near has voice enabled
-    </string>
-    <string
-     name="max_visible_items">
-        5
     </string>
       <layout_stack
          clip="false"
@@ -126,6 +122,7 @@
          follows="left|right|top"
          height="24"
          layout="topleft"
+         background_visible="false"
          left="0"
          name="non_avatar_caller"
          top="10"
-- 
cgit v1.2.3


From eab73793fc0b1b3832a7ad190e0d62708f39be90 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Tue, 12 Jan 2010 11:49:56 -0800
Subject: fixed resizing logic not working for call floater

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index c438d28236..ae198d69a3 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -122,7 +122,6 @@
          follows="left|right|top"
          height="24"
          layout="topleft"
-         background_visible="false"
          left="0"
          name="non_avatar_caller"
          top="10"
-- 
cgit v1.2.3


From ac0107b44dbea51d6dfafac5f402e8513c3adb67 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Tue, 12 Jan 2010 14:53:17 -0500
Subject: Increased interior padding on left side of location input.
 http://jira.secondlife.com/browse/EXT-4192

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 0f1c8d0635..1c0a8ba7c5 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -121,7 +121,7 @@
 	      page_lines="10"
               scroll_bar_bg_visible="true" />
   <combo_editor name="Combo Text Entry"
-                text_pad_left="22"
+                text_pad_left="27"
                 select_on_focus="false"
                 font="SansSerifSmall"
                 bevel_style="none"
-- 
cgit v1.2.3


From b0f62f010c23d7925aea028cfae4cb262eb28b60 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Tue, 12 Jan 2010 16:38:14 -0500
Subject: Shortened string to accomodate side panel width.
 http://jira.secondlife.com/browse/EXT-3798

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f2f23a3847..cf8f91bf51 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1808,7 +1808,7 @@ Clears (deletes) the media and all params from the given face.
 
 	<!-- inventory -->
 	<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
-  <string name="FavoritesNoMatchingItems">Drag and drop a landmark here to add to your favorites.</string>
+  <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string>
 	<string name="InventoryNoTexture">
 		You do not have a copy of
 this texture in your inventory
-- 
cgit v1.2.3


From 612015f6939eef31fa28b810b224463f03ab478f Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Tue, 12 Jan 2010 17:52:02 -0500
Subject: Changed "follows" attribute for refresh button.
 http://jira.secondlife.com/browse/EXT-4166

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index 68bb500c78..bf61697a59 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -190,7 +190,7 @@
           function="TopObjects.GetByOwnerName" />
     </button>
     <button
-     follows="top|left"
+     follows="bottom|right"
      height="22"
      image_overlay="Refresh_Off"
      layout="topleft"
-- 
cgit v1.2.3


From 5a88a496ff383c7cc3718a699e47251b16269285 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Wed, 13 Jan 2010 11:55:59 -0500
Subject: EXT-4065 Preferences: Wrong window background color on Advanced tab

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 17651b8caa..1e7acb566f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -2,7 +2,6 @@
 
 <panel
  border="true"
- background_visible="true"
  follows="left|top|right|bottom"
  height="408"
  layout="topleft"
-- 
cgit v1.2.3


From 15d50a02c67595251676f0028cf59d1e38111c77 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Wed, 13 Jan 2010 12:28:17 -0500
Subject: ext-4056 Preferences: Draw Distance value and "m" are not vertically
 aligned

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index cc00abf5a0..a0fcf59fc8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -378,7 +378,7 @@
 		layout="topleft"
 		left_delta="250"
 		name="DrawDistanceMeterText2"
-		top_delta="1"
+		top_delta="0"
 		width="128">
 			m
 		</text>
@@ -395,7 +395,7 @@
 		left="216"
 		max_val="8192"
 		name="MaxParticleCount"
-		top_pad="6"
+		top_pad="7"
 		width="262" />
 		<slider
 		control_name="RenderGlowResolutionPow"
-- 
cgit v1.2.3


From 1bd0402f78045faaebd7ff50a02650999492db90 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Wed, 13 Jan 2010 13:43:00 -0500
Subject: EXT-3939 Display problems when object price == MAXINT

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 26b003cafe..d202bf1b9f 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -107,7 +107,7 @@
      height="16"
      layout="topleft"
      top_delta="0"
-     left="242"
+     left="217"
      name="currency_label"
      width="15">
       L$
@@ -123,7 +123,7 @@
      label="L$"
      left_pad="3"
      name="currency_amt"
-     width="60">
+     width="85">
         1234
     </line_editor>
     <text
@@ -222,7 +222,7 @@
      width="300"
      height="30"
      name="currency_links">
-      [http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
+      [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate]
     </text>
     <text
      type="string"
-- 
cgit v1.2.3


From 627db00b0ea86112b7b9d2912f0822cb1ab90650 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Wed, 13 Jan 2010 15:56:19 -0500
Subject: Adjusted width of panel and scroll list columns to make "Mono Time"
 column label visible. Added column in XUI for URLs.
 http://jira.secondlife.com/browse/EXT-4167

---
 .../skins/default/xui/en/floater_top_objects.xml       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index bf61697a59..b06c6dc215 100644
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -9,7 +9,7 @@
  name="top_objects"
  help_topic="top_objects"
  title="Top Objects"
- width="550">
+ width="800">
     <floater.string
      name="top_scripts_title">
         Top Scripts
@@ -64,7 +64,7 @@
      multi_select="true"
      name="objects_list"
      top_delta="17"
-     width="530">
+     width="780">
         <scroll_list.columns
          label="Score"
          name="score"
@@ -84,11 +84,15 @@
         <scroll_list.columns
          label="Time"
          name="time"
-         width="100" />
+         width="150" />
         <scroll_list.columns
          label="Mono Time"
          name="mono_time"
-         width="55" />
+         width="100" />
+          <scroll_list.columns
+          	label="URLs"
+          	name="URLs"
+          	width="100" />
 		<scroll_list.commit_callback
           function="TopObjects.CommitObjectsList" />
     </scroll_list>
@@ -112,7 +116,7 @@
      left_pad="3"
      name="id_editor"
      top_delta="-3"
-     width="325" />
+     width="575" />
     <button
      follows="bottom|right"
      height="23"
@@ -144,7 +148,7 @@
      left_pad="3"
      name="object_name_editor"
      top_delta="-3"
-     width="325" />
+     width="575" />
     <button
      follows="bottom|right"
      height="23"
@@ -176,7 +180,7 @@
      left_pad="3"
      name="owner_name_editor"
      top_delta="-3"
-     width="325" />
+     width="575" />
     <button
      follows="bottom|right"
      height="23"
-- 
cgit v1.2.3


From 92653ac61cdd6838cf80c1f941bbfa6c8c6be2e2 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 13 Jan 2010 13:01:01 -0800
Subject: EXT-3383 adhere to style guide for capitalization of 'Resident'

---
 indra/newview/skins/default/xui/en/floater_about.xml    |  2 +-
 .../newview/skins/default/xui/en/floater_about_land.xml |  8 ++++----
 .../newview/skins/default/xui/en/floater_god_tools.xml  |  2 +-
 indra/newview/skins/default/xui/en/floater_im.xml       |  2 +-
 .../skins/default/xui/en/floater_report_abuse.xml       |  4 ++--
 indra/newview/skins/default/xui/en/notifications.xml    | 17 +++++++++--------
 .../skins/default/xui/en/panel_block_list_sidetray.xml  |  6 +++---
 indra/newview/skins/default/xui/en/panel_friends.xml    |  2 +-
 .../newview/skins/default/xui/en/panel_group_invite.xml |  6 +++---
 indra/newview/skins/default/xui/en/panel_my_profile.xml |  2 +-
 indra/newview/skins/default/xui/en/panel_notes.xml      |  6 +++---
 indra/newview/skins/default/xui/en/panel_people.xml     | 10 +++++-----
 indra/newview/skins/default/xui/en/panel_profile.xml    |  8 ++++----
 .../skins/default/xui/en/panel_region_estate.xml        |  4 ++--
 indra/newview/skins/default/xui/en/strings.xml          | 14 +++++++-------
 15 files changed, 47 insertions(+), 46 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index fac7aef690..b6443c4c21 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -112,7 +112,7 @@ Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number
        word_wrap="true">
 Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
 
-Thank you to the following residents for helping to ensure that this is the best version yet: (in progress)
+Thank you to the following Residents for helping to ensure that this is the best version yet: (in progress)
 
 
 
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 33fdd923ad..900f4c5956 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1036,7 +1036,7 @@ Leyla Linden               </text>
              name="Autoreturn"
              top="164"
              width="294">
-                Autoreturn other residents&apos; objects (minutes, 0 for off):
+                Autoreturn other Residents&apos; objects (minutes, 0 for off):
             </text>
             <line_editor
              border_style="line"
@@ -1175,7 +1175,7 @@ Only large parcels can be listed in search.
              name="allow_label"
              top="10"
              width="278">
-                Allow other residents to:
+                Allow other Residents to:
             </text>
             <check_box
              height="16"
@@ -1917,7 +1917,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left_delta="0"
              name="limit_payment"
-             tool_tip="Ban unidentified residents."
+             tool_tip="Ban unidentified Residents."
              top_pad="4"
              width="278" />
             <check_box
@@ -1927,7 +1927,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left_delta="0"
              name="limit_age_verified"
-             tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
+             tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
              top_pad="4"
              width="278" />
             <check_box
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index b01c0edc8b..0fac6cd5f1 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -123,7 +123,7 @@
              layout="topleft"
              left_delta="0"
              name="check reset home"
-             tool_tip="When resident teleports out, reset their home to the destination position."
+             tool_tip="When Resident teleports out, reset their home to the destination position."
              top_pad="4"
              width="180">
 			       <check_box.commit_callback
diff --git a/indra/newview/skins/default/xui/en/floater_im.xml b/indra/newview/skins/default/xui/en/floater_im.xml
index 92a6111759..a21242ffe1 100644
--- a/indra/newview/skins/default/xui/en/floater_im.xml
+++ b/indra/newview/skins/default/xui/en/floater_im.xml
@@ -26,7 +26,7 @@
     </multi_floater.string>
     <multi_floater.string
      name="muted_message">
-        You have blocked this resident. Sending a message will automatically unblock them.
+        You have blocked this Resident. Sending a message will automatically unblock them.
     </multi_floater.string>
     <multi_floater.string
      name="generic_request_error">
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index f1a75bfcb4..aa219b9615 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -201,11 +201,11 @@
          name="Age__Age_play"
          value="31" />
         <combo_box.item
-         label="Age &gt; Adult resident on Teen Second Life"
+         label="Age &gt; Adult Resident on Teen Second Life"
          name="Age__Adult_resident_on_Teen_Second_Life"
          value="32" />
         <combo_box.item
-         label="Age &gt; Underage resident outside of Teen Second Life"
+         label="Age &gt; Underage Resident outside of Teen Second Life"
          name="Age__Underage_resident_outside_of_Teen_Second_Life"
          value="33" />
         <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 410c398ea5..3309876376 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -246,7 +246,7 @@ Save all changes to clothing/body parts?
    icon="alertmodal.tga"
    name="GrantModifyRights"
    type="alertmodal">
-Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
 Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
     <usetemplate
      name="okcancelbuttons"
@@ -258,7 +258,7 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
    icon="alertmodal.tga"
    name="GrantModifyRightsMultiple"
    type="alertmodal">
-Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
 Do you want to grant modify rights for the selected Residents?
     <usetemplate
      name="okcancelbuttons"
@@ -1597,7 +1597,8 @@ Unable to force land ownership because selection spans multiple regions. Please
    icon="alertmodal.tga"
    name="ForceOwnerAuctionWarning"
    type="alertmodal">
-This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership?
+This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun.
+Force ownership?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -3553,7 +3554,7 @@ Type a short announcement which will be sent to everyone in this region.
 The maturity rating for this region has been updated.
 It may take some time for the change to be reflected on the map.
 
-To enter Adult regions, residents must be Account Verified, either by age-verification or payment-verification.
+To enter Adult regions, Residents must be Account Verified, either by age-verification or payment-verification.
   </notification>
 
   <notification
@@ -4543,8 +4544,8 @@ Click on any landmark to select it, then click &apos;Teleport&apos; at the botto
    icon="notifytip.tga"
    name="TeleportToPerson"
    type="notifytip">
-You can contact residents like &apos;[NAME]&apos; by opening the People panel on the right side of your screen.
-Select the resident from the list, then click &apos;IM&apos; at the bottom of the panel.
+You can contact Residents like &apos;[NAME]&apos; by opening the People panel on the right side of your screen.
+Select the Resident from the list, then click &apos;IM&apos; at the bottom of the panel.
 (You can also double-click on their name in the list, or right-click and choose &apos;IM&apos;).
   </notification>
 
@@ -4693,7 +4694,7 @@ The objects on the selected parcel of land that is owned by [FIRST] [LAST] have
    icon="notify.tga"
    name="OtherObjectsReturned2"
    type="notify">
-The objects on the selected parcel of land owned by the resident &apos;[NAME]&apos; have been returned to their owner.
+The objects on the selected parcel of land owned by the Resident &apos;[NAME]&apos; have been returned to their owner.
   </notification>
 
   <notification
@@ -5181,7 +5182,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
    name="OfferCallingCard"
    type="notify">
 [FIRST] [LAST] is offering their calling card.
-This will add a bookmark in your inventory so you can quickly IM this resident.
+This will add a bookmark in your inventory so you can quickly IM this Resident.
     <form name="form">
       <button
        index="0"
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 003e1baa7e..39170b90ca 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -37,7 +37,7 @@
      layout="topleft"
      left="5"
      name="blocked"
-     tool_tip="List of currently blocked residents"
+     tool_tip="List of currently blocked Residents"
      top="30"
      width="270" />
     <button
@@ -47,7 +47,7 @@
      layout="topleft"
      left_delta="0"
      name="Block resident..."
-     tool_tip="Pick a resident to block"
+     tool_tip="Pick a Resident to block"
      top_pad="4"
      width="210">
         <button.commit_callback
@@ -74,7 +74,7 @@
      layout="topleft"
      left_delta="0"
      name="Unblock"
-     tool_tip="Remove resident or object from blocked list"
+     tool_tip="Remove Resident or object from blocked list"
      top_pad="4"
      width="210" >
         <button.commit_callback
diff --git a/indra/newview/skins/default/xui/en/panel_friends.xml b/indra/newview/skins/default/xui/en/panel_friends.xml
index ac731bcdf0..c315adb33e 100644
--- a/indra/newview/skins/default/xui/en/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_friends.xml
@@ -118,7 +118,7 @@
      layout="topleft"
      left_delta="0"
      name="add_btn"
-     tool_tip="Offer friendship to a resident"
+     tool_tip="Offer friendship to a Resident"
      top_pad="13"
      width="80" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index 37578eae70..c17317d0e8 100644
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -28,7 +28,7 @@
      name="help_text"
      top="24"
      width="200">
-        You can select multiple residents to 
+        You can select multiple Residents to 
 invite to your group. Click &apos;Open 
 Resident Chooser&apos; to start.
     </text>
@@ -48,7 +48,7 @@ Resident Chooser&apos; to start.
      left_delta="0"
      multi_select="true"
      name="invitee_list"
-     tool_tip="Hold the Ctrl key and click resident names to multi-select"
+     tool_tip="Hold the Ctrl key and click Resident names to multi-select"
      top_pad="4"
      width="200" />
     <button
@@ -57,7 +57,7 @@ Resident Chooser&apos; to start.
      layout="topleft"
      left_delta="0"
      name="remove_button"
-     tool_tip="Removes residents selected above from the invite list"
+     tool_tip="Removes the Residents selected above from the invite list"
      top_pad="4"
      width="200" />
     <text
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 8327edfdd0..4a1a468186 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -312,7 +312,7 @@
          left="0"
          mouse_opaque="false"
          name="add_friend"
-         tool_tip="Offer friendship to the resident"
+         tool_tip="Offer friendship to the Resident"
          top="5"
          width="80" />
         <button
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 73528b28ad..45b64d5e26 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -120,7 +120,7 @@
          left="0"
          mouse_opaque="false"
          name="add_friend"
-         tool_tip="Offer friendship to the resident"
+         tool_tip="Offer friendship to the Resident"
          top="5"
          width="80" />
         <button
@@ -139,7 +139,7 @@
          label="Call"
          layout="topleft"
          name="call"
-         tool_tip="Call this resident"
+         tool_tip="Call this Resident"
          left_pad="3"
          top="5"
          width="45" />
@@ -150,7 +150,7 @@
          label="Map"
          layout="topleft"
          name="show_on_map_btn"
-         tool_tip="Show the resident on the map"
+         tool_tip="Show the Resident on the map"
          top="5"
          left_pad="3"
          width="45" />
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index adf22f825f..8a02637817 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -106,7 +106,7 @@ background_visible="true"
                  left_pad="5"
                  name="add_friend_btn"
                  top_delta="0"
-                 tool_tip="Add selected resident to your friends List"
+                 tool_tip="Add selected Resident to your friends List"
                  width="18">
                <commit_callback
                   function="People.addFriend" />
@@ -192,7 +192,7 @@ background_visible="true"
                  layout="topleft"
                  left_pad="5"
                  name="add_btn"
-                 tool_tip="Offer friendship to a resident"
+                 tool_tip="Offer friendship to a Resident"
                  top_delta="0"
                  width="18" />
                 <button
@@ -327,7 +327,7 @@ background_visible="true"
                  left_pad="5"
                  name="add_friend_btn"
                  top_delta="0"
-                 tool_tip="Add selected resident to your friends List"
+                 tool_tip="Add selected Resident to your friends List"
                  width="18">
                 <commit_callback
                    function="People.addFriend" />
@@ -350,7 +350,7 @@ background_visible="true"
          label="Profile"
          layout="topleft"
          name="view_profile_btn"
-         tool_tip="Show picture, groups, and other residents information"
+         tool_tip="Show picture, groups, and other Residents information"
          width="70" />
         <button
          follows="bottom|left"
@@ -370,7 +370,7 @@ background_visible="true"
          label="Call"
          layout="topleft"
          name="call_btn"
-         tool_tip="Call this resident"
+         tool_tip="Call this Resident"
          width="50" />
         <button
          follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 43947262ec..65d7420335 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -292,7 +292,7 @@
          left="0"
          mouse_opaque="false"
          name="add_friend"
-         tool_tip="Offer friendship to the resident"
+         tool_tip="Offer friendship to the Resident"
          top="5"
          width="80" />
         <button
@@ -311,7 +311,7 @@
          label="Call"
          layout="topleft"
          name="call"
-         tool_tip="Call this resident"
+         tool_tip="Call this Resident"
          left_pad="3"
          top="5"
          width="45" />
@@ -322,7 +322,7 @@
          label="Map"
          layout="topleft"
          name="show_on_map_btn"
-         tool_tip="Show the resident on the map"
+         tool_tip="Show the Resident on the map"
          top="5"
          left_pad="3"
          width="45" />
@@ -342,7 +342,7 @@
          label="▼"
          layout="topleft"
          name="overflow_btn"
-         tool_tip="Pay money to or share inventory with the resident"
+         tool_tip="Pay money to or share inventory with the Resident"
          right="-1"
          top="5"
 	 left_pad="3"
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index ba39e88024..6ddd018c7a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -147,7 +147,7 @@ regions in the estate.
      layout="topleft"
      left_delta="0"
      name="limit_payment"
-     tool_tip="Ban unidentified residents"
+     tool_tip="Ban unidentified Residents"
      top_pad="2"
      width="278" />
     <check_box
@@ -157,7 +157,7 @@ regions in the estate.
      layout="topleft"
      left_delta="0"
      name="limit_age_verified"
-     tool_tip="Ban residents who have not verified their age. See the [SUPPORT_SITE] for more information."
+     tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."
      top_pad="2"
      width="278" />
     <check_box
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index cf8f91bf51..02dc507781 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -67,7 +67,7 @@
 	<!-- tooltips for Urls -->
 	<string name="TooltipHttpUrl">Click to view this web page</string>
 	<string name="TooltipSLURL">Click to view this location's information</string>
-	<string name="TooltipAgentUrl">Click to view this resident's profile</string>
+	<string name="TooltipAgentUrl">Click to view this Resident's profile</string>
 	<string name="TooltipGroupUrl">Click to view this group's description</string>
 	<string name="TooltipEventUrl">Click to view this event's description</string>
 	<string name="TooltipClassifiedUrl">Click to view this classified</string>
@@ -1609,11 +1609,11 @@ Sends an HTTP request to the specified url with the body of the request and para
 	</string>
 	<string name="LSLTipText_llResetLandBanList" translate="false">
 llResetLandBanList()
-Removes all residents from the land ban list
+Removes all Residents from the land ban list
 	</string>
 	<string name="LSLTipText_llResetLandPassList" translate="false">
 llResetLandPassList()
-Removes all residents from the land access/pass list
+Removes all Residents from the land access/pass list
 	</string>
 	<string name="LSLTipText_llGetObjectPrimCount" translate="false">
 integer llGetObjectPrimCount(key object_id)
@@ -1621,7 +1621,7 @@ Returns the total number of prims for an object in the region
 	</string>
 	<string name="LSLTipText_llGetParcelPrimOwners" translate="false">
 list llGetParcelPrimOwners(vector pos)
-Returns a list of all residents who own objects on the parcel at pos and with individual prim counts.
+Returns a list of all Residents who own objects on the parcel at pos and with individual prim counts.
 Requires owner-like permissions for the parcel.
 	</string>
 	<string name="LSLTipText_llGetParcelPrimCount" translate="false">
@@ -2039,7 +2039,7 @@ this texture in your inventory
 	<string name="RegionInfoAllEstatesYouManage">
 		all estates that you manage for [OWNER]
 	</string>
-	<string name="RegionInfoAllowedResidents">Allowed residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
+	<string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
 	<string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
 
 	<!-- script limits floater -->
@@ -2110,7 +2110,7 @@ this texture in your inventory
 
 	<!-- Mute -->
 	<string name="MuteByName">(by name)</string>
-	<string name="MuteAgent">(resident)</string>
+	<string name="MuteAgent">(Resident)</string>
 	<string name="MuteObject">(object)</string>
 	<string name="MuteGroup">(group)</string>
 
@@ -2937,7 +2937,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     Click the [BUTTON NAME] button to accept/connect to this voice chat.
   </string>
   <string name="muted_message">
-    You have blocked this resident. Sending a message will automatically unblock them.
+    You have blocked this Resident. Sending a message will automatically unblock them.
   </string>
   <!--Some times string name is getting from the body of server response.
   For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. 
-- 
cgit v1.2.3


From 9b6195fcb2b2642fcd0b934effeb90b5fe22dc64 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 13 Jan 2010 14:30:23 -0800
Subject: EXT-4272 Style Unread message IM talk bubble chiclet overlay image to
 match spec

---
 .../default/textures/bottomtray/Unread_Chiclet.png | Bin 250 -> 328 bytes
 .../default/textures/bottomtray/WellButton_Lit.png | Bin 553 -> 490 bytes
 .../bottomtray/WellButton_Lit_Selected.png         | Bin 687 -> 302 bytes
 .../default/xui/en/widgets/chiclet_im_adhoc.xml    |  22 +++++++++-----------
 .../default/xui/en/widgets/chiclet_im_group.xml    |  23 ++++++++++-----------
 .../default/xui/en/widgets/chiclet_im_p2p.xml      |  18 +++++++---------
 .../skins/default/xui/en/widgets/chiclet_offer.xml |  14 ++++++-------
 .../default/xui/en/widgets/chiclet_script.xml      |  14 ++++++-------
 8 files changed, 43 insertions(+), 48 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png
index 447e0af0be..6343ddf035 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png and b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
index dd9133bcc4..661d1c5611 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png and b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
index 0080e71f41..f927fd3989 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png and b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png differ
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index af0d338256..693c43f141 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_adhoc
- font="SansSerif"
  height="25"
  name="im_adhoc_chiclet"
  show_speaker="false"
@@ -12,15 +11,14 @@
      left="25"
      name="speaker"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_adhoc.avatar_icon
      follows="left|top|bottom"
      height="22"
      mouse_opaque="true"
      name="adhoc_icon"
-     width="22"/>
+     width="22" />
     <chiclet_im_adhoc.unread_notifications
-     font="SansSerif"
      font_halign="center"
      height="25"
      left="25"
@@ -29,13 +27,13 @@
      text_color="white"
      v_pad="5"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_adhoc.new_message_icon
-     bottom="12"
-     height="13"
-     image_name="Unread_Chiclet"
-     left="12"
-     name="new_message_icon"
-     visible="false"
-     width="13" />
+  bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
+  left="12"
+  name="new_message_icon"
+  visible="false"
+  width="14" />
 </chiclet_im_adhoc>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index b1988a2d20..f4fc58701c 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_group
- font="SansSerif"
  height="25"
  name="im_group_chiclet"
  show_speaker="false"
@@ -12,17 +11,17 @@
      left="25"
      name="speaker"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_group.group_icon
      default_icon="Generic_Group"
      follows="left|top|bottom"
-     height="22"
+     height="18"
+  bottom_pad="4"
      mouse_opaque="true"
      name="group_icon"
-     width="22"/>
+     width="18" />
     <chiclet_im_group.unread_notifications
      height="25"
-     font="SansSerif"
      font_halign="center"
      left="25"
      mouse_opaque="false"
@@ -32,11 +31,11 @@
      visible="false"
      width="20"/>
     <chiclet_im_group.new_message_icon
-     bottom="12"
-     height="13"
-     image_name="Unread_Chiclet"
-     left="12"
-     name="new_message_icon"
-     visible="false"
-     width="13" />
+bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
+  left="12"
+  name="new_message_icon"
+  visible="false"
+  width="14" />
 </chiclet_im_group>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index 52fbce0de7..535113f717 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_im_p2p
- font="SansSerif"
  height="25"
  name="im_p2p_chiclet"
  show_speaker="false"
@@ -18,10 +17,9 @@
      height="22"
      mouse_opaque="true"
      name="avatar_icon"
-     width="22"/>
+     width="22" />
     <chiclet_im_p2p.unread_notifications
      height="25"
-     font="SansSerif"
      font_halign="center"
      left="25"
      mouse_opaque="false"
@@ -31,11 +29,11 @@
      visible="false"
      width="20"/>
     <chiclet_im_p2p.new_message_icon
-     bottom="12"
-     height="13"
-     image_name="Unread_Chiclet"
-     left="12"
-     name="new_message_icon"
-     visible="false"
-     width="13" />
+  bottom="11"
+  height="14"
+  image_name="Unread_Chiclet"
+  left="12"
+  name="new_message_icon"
+  visible="false"
+  width="14" />
 </chiclet_im_p2p>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 33f85a964c..86bea9be50 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_offer
- font="SansSerif"
  height="25"
  name="offer_chiclet"
  width="25">
  <chiclet_offer.icon
-  default_icon="Generic_Object_Small" 
+  default_icon="Generic_Object_Small"
   follows="all"
-  height="22"
+  height="20"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="22"/>
+  bottom_pad="2"
+  width="20" />
  <chiclet_offer.new_message_icon
-  bottom="12"
-  height="13"
+  bottom="11"
+  height="14"
   image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
-  width="13" />
+  width="14" />
 </chiclet_offer>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index 560c8e6ea5..b1f9f5b0e8 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_script
- font="SansSerif"
  height="25"
  name="script_chiclet"
  width="25">
  <chiclet_script.icon
   follows="all"
-  height="22"
-  image_name="Generic_Object_Small" 
+  height="20"
+  image_name="Generic_Object_Small"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="22"/>
+  width="20"
+  bottom_pad="2" />
  <chiclet_script.new_message_icon
-  bottom="12"
-  height="13"
+  bottom="11"
+  height="14"
   image_name="Unread_Chiclet"
   left="12"
   name="new_message_icon"
   visible="false"
-  width="13" />
+  width="14" />
 </chiclet_script>
\ No newline at end of file
-- 
cgit v1.2.3


From 2d9de5c0de366b1756023d3745cc1e5f21d3be44 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 13 Jan 2010 16:21:49 -0800
Subject: EXT-3685 	 Object Profile panel layout issues reviewed by
 Richard

---
 .../skins/default/xui/en/sidepanel_task_info.xml   | 36 ++++++----------------
 1 file changed, 9 insertions(+), 27 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index d26e855e2f..2dfcdf4a4c 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -153,28 +153,19 @@
 		     layout="topleft"
     		 left="5"
 		 name="CreatorNameLabel"
-		  top_pad="10"
+		  top_pad="12"
 		     width="78">
 	        Creator:
     	</text>
-	    	<avatar_icon
-     follows="top|left"
-     height="20"
-     default_icon_name="Generic_Person"
-     layout="topleft"
-     left_pad="0"
-      top_delta="-6"
-     mouse_opaque="true"
-     width="20" />
 	    <text
 		     type="string"
-     follows="left|right"
+     follows="left|right|top"
      font="SansSerifSmall"
      height="15"
      layout="topleft"
-     left_pad="5"
+     left_pad="0"
              name="Creator Name"
-		     top_delta="6"
+		     top_delta="0"
 		     width="140">
 	        Erica Linden
 	     </text>
@@ -186,28 +177,19 @@
 			layout="topleft"
 			left="5"
 			name="Owner:"
-			top_pad="10"
+			top_pad="15"
 			 width="78">
 			    Owner:
 	     </text>
-	     <avatar_icon
-     follows="top|left"
-     height="20"
-     default_icon_name="Generic_Person"
-     layout="topleft"
-     left_pad="0"
-	    top_delta="-6"
-	    mouse_opaque="true"
-     width="20" />
 	     <text
 			    type="string"
-			    follows="left|right"
+			    follows="left|right|top"
 			    font="SansSerifSmall"
 			    height="15"
 			    layout="topleft"
-			    left_pad="5"
+			    left_pad="0"
 			    name="Owner Name"
-			    top_delta="6"
+			    top_delta="0"
 			    width="140">
 			    Erica Linden
 	     </text>
@@ -219,7 +201,7 @@
 			 layout="topleft"
 			 left="5"
 			name="Group_label"
-			top_pad="10"
+			top_pad="15"
 			width="78">
 			    Group:
 	     </text>
-- 
cgit v1.2.3


From f036c0c0c41f8f8e3fe22e08ff4e04626d69a64c Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 13 Jan 2010 17:08:15 -0800
Subject: EXT-3504 fix text boxes that use a carriage return to format
 wordwrapped lines within a sentence; instead, these should use a 1-line
 string and word_wrap="true".

---
 .../skins/default/xui/en/floater_customize.xml     | 120 ++++++++++-----------
 .../skins/default/xui/en/floater_select_key.xml    |   8 +-
 indra/newview/skins/default/xui/en/floater_tos.xml |   6 +-
 .../skins/default/xui/en/panel_group_invite.xml    |  10 +-
 .../skins/default/xui/en/panel_region_covenant.xml |  10 +-
 .../skins/default/xui/en/panel_region_estate.xml   |   8 +-
 .../skins/default/xui/en/panel_region_texture.xml  |   4 +-
 7 files changed, 84 insertions(+), 82 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 0dc7d62b19..ddc0d9af72 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -260,10 +260,9 @@
              left="10"
              name="not worn instructions"
              top="31"
+             word_wrap="true"
              width="373">
-                Put on a new shape by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new shape by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -274,6 +273,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -300,7 +300,7 @@ scratch and wear it.
              left="10"
              name="Create New"
              top="104"
-             width="140" />
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
@@ -463,10 +463,9 @@ scratch and wear it.
              left="10"
              name="not worn instructions"
              top="31"
+             word_wrap="true"
              width="373">
-                Put on a new skin by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new skin by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -477,6 +476,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -542,7 +542,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-249"
-             width="120" />
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
@@ -713,10 +713,9 @@ scratch and wear it.
              left="10"
              name="not worn instructions"
              top="31"
+             word_wrap="true"
              width="373">
-                Put on a new hair by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new hair by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -727,6 +726,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -765,7 +765,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-89"
-             width="120" />
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
@@ -898,10 +898,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new eyes by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -912,6 +911,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -950,7 +950,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="39"
-             width="120" />
+             width="160" />
             <button
              follows="right|bottom"
              height="23"
@@ -1056,7 +1056,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -1170,10 +1170,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new shirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new shirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1184,6 +1183,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1262,7 +1262,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -1376,10 +1376,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new pants by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on new pants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1390,6 +1389,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1509,10 +1509,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new shoes by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new pair of shoes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1523,6 +1522,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1572,7 +1572,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -1715,10 +1715,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new socks by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on new socks by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1729,6 +1728,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1778,7 +1778,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -1921,10 +1921,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new jacket by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new jacket by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -1935,6 +1934,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -1996,7 +1996,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-121"
-             width="140" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -2139,10 +2139,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new gloves by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on new gloves by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2153,6 +2152,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2202,7 +2202,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="130" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -2345,10 +2345,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new undershirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new undershirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2359,6 +2358,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2551,10 +2551,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new underpants by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on new underpants by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2565,6 +2564,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2757,10 +2757,9 @@ scratch and wear it.
              left_delta="0"
              name="not worn instructions"
              top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new skirt by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new skirt by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2771,6 +2770,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -2820,7 +2820,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-41"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -2962,11 +2962,10 @@ scratch and wear it.
              layout="topleft"
              left_delta="-2"
              name="not worn instructions"
-             top_delta="2"
+             top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new alpha mask by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new alpha mask by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -2977,6 +2976,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -3108,7 +3108,7 @@ scratch and wear it.
              left="8"
              name="Create New"
              top="104"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
@@ -3250,11 +3250,10 @@ scratch and wear it.
              layout="topleft"
              left_delta="-2"
              name="not worn instructions"
-             top_delta="2"
+             top_pad="8"
+             word_wrap="true"
              width="373">
-                Put on a new tattoo by dragging one from your inventory
-to your avatar. Alternately, you create a new one from
-scratch and wear it.
+                Put on a new tattoo by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it.
             </text>
             <text
              type="string"
@@ -3265,6 +3264,7 @@ scratch and wear it.
              left_delta="0"
              name="no modify instructions"
              top_delta="0"
+             word_wrap="true"
              width="373">
                 You do not have permission to modify this wearable.
             </text>
@@ -3327,7 +3327,7 @@ scratch and wear it.
              left_delta="0"
              name="Create New"
              top_delta="-121"
-             width="120" />
+             width="160" />
             <button
              follows="left|top"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 93aa1f0e31..4e89df5a73 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -15,13 +15,12 @@
      follows="left|top"
      height="30"
      layout="topleft"
-     left="10"
+     left="30"
      name="Save item as:"
      top="25"
      word_wrap="true"
-     width="220">
-        Press a key to set your
-Speak button trigger.
+     width="180">
+        Press a key to set your Speak button trigger.
     </text>
     <button
      height="23"
@@ -30,5 +29,6 @@ Speak button trigger.
      layout="topleft"
      right="-10"
      name="Cancel"
+     top_pad="8"
      width="100" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index 1adb824e2a..5e168fe4aa 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -49,9 +49,9 @@
      left_delta="0"
      name="tos_heading"
      top_delta="-399"
+     word_wrap="true"
      width="552">
-        Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE],
-you must accept the agreement.
+        Please read the following Terms of Service carefully. To continue logging in to [SECOND_LIFE], you must accept the agreement.
     </text>
     <web_browser
      follows="left|top"
@@ -60,6 +60,6 @@ you must accept the agreement.
      left_delta="0"
      name="tos_html"
      start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
-     top_delta="0"
+     top_delta="40"
      width="568" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index c17317d0e8..48083b7677 100644
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -17,7 +17,7 @@
     </panel.string>
     <panel.string
      name="already_in_group">
-        Some avatars are already in group and were not invited.
+        Some Residents you chose are already in the group, and so were not sent an invitation.
     </panel.string>
     <text
      type="string"
@@ -26,11 +26,10 @@
      layout="topleft"
      left="7"
      name="help_text"
-     top="24"
+     top="28"
+     word_wrap="true"
      width="200">
-        You can select multiple Residents to 
-invite to your group. Click &apos;Open 
-Resident Chooser&apos; to start.
+        You can select multiple Residents to invite to your group. Click &apos;Open Resident Chooser&apos; to start.
     </text>
     <button
      height="20"
@@ -68,6 +67,7 @@ Resident Chooser&apos; to start.
      left_delta="4"
      name="role_text"
      top_pad="5"
+     word_wrap="true"
      width="200">
         Choose what Role to assign them to:
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index ff55090f16..dc8f71c868 100644
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
@@ -135,7 +135,8 @@
      left="120"
      name="covenant_help_text"
      top_pad="10"
-     width="460">
+     word_wrap="true"
+     width="360">
         Changes to the covenant will show on all parcels in the estate.
     </text>
     <text
@@ -145,9 +146,10 @@
      left_delta="0"
      name="covenant_instructions"
      top_pad="5"
-     width="465">
-        Drag and drop a notecard to change
-        the Covenant for this Estate.
+     word_wrap="true"
+     font.style="ITALIC"
+     width="360">
+        Drag and drop a notecard to change the Covenant for this estate.
     </text>
 
     <text
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 6ddd018c7a..3980eb86d3 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -19,9 +19,9 @@
      left="10"
      name="estate_help_text"
      top="14"
-     width="313">
-        Changes to settings on this tab will affect all
-regions in the estate.
+     word_wrap="true"
+     width="275">
+        Changes to settings on this tab will affect all regions in the estate.
     </text>
     <text
      type="string"
@@ -138,7 +138,7 @@ regions in the estate.
      name="Only Allow"
      top="250"
      width="278">
-        Restrict Access to Accounts Verified by:
+        Restrict Access to accounts verified by:
     </text>
     <check_box
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_region_texture.xml b/indra/newview/skins/default/xui/en/panel_region_texture.xml
index 502a5804c3..04dbf73be9 100644
--- a/indra/newview/skins/default/xui/en/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_texture.xml
@@ -292,7 +292,7 @@
        name="height_text_lbl10"
        top_delta="30"
        width="400"
-       wrap="true">
+       word_wrap="true">
         These values represent the blend range for the textures above.
       </text>
       <text
@@ -303,7 +303,7 @@
        name="height_text_lbl11"
        top_delta="32"
        width="400"
-       wrap="true">
+       word_wrap="true">
         Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
       </text>
     <button
-- 
cgit v1.2.3