From 5db02993ef806d2d73ae3e3fde89c3405132a348 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Mon, 27 Sep 2010 20:20:09 -0400
Subject: [STORM-255] As a user I would like to disable incoming Group/IM
 toasts from showing up. 	This will also take care of STORM-221 since
 the person that would be affected by 	the toast cha now disable them.

---
 .../default/xui/en/panel_preferences_chat.xml      | 36 ++++++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 31e160ec33..3adc174aaf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -343,7 +343,7 @@
      left="30"
      height="20"
      width="170"
-     top_pad="14">
+     top_pad="7">
      Show IMs in:
     </text>
     <text
@@ -359,8 +359,8 @@
       (requires restart)
       </text>
     <radio_group
+     follows="left|top"
      height="30"
-     layout="topleft"
      left="40"
      control_name="ChatWindow"
      name="chat_window"
@@ -386,6 +386,36 @@
       top_pad="5"
       width="150" />
     </radio_group>
+    <text
+     name="disable_toast_label"
+     follows="left|top"
+     layout="topleft"
+     top_delta="-22" 
+     left="280" 
+     height="10"
+     width="180">
+      Disable incoming notifications:
+      </text>
+    <check_box
+     control_name="DisableGroupToast"
+     name="DisableGroupToast"
+     label="Group chats" 
+     layout="topleft"
+     top_delta="18" 
+     left="295" 
+     height="20"
+     tool_tip="Checking this will turn off Group Toasts poping up"
+     width="400" />
+    <check_box
+     control_name="DisableIMToast"
+     name="DisableIMToast"
+     label="Im chats" 
+     layout="topleft"
+     top_delta="22" 
+     left="295" 
+     height="20"
+     tool_tip="Checking this will turn off IM Chat Toasts poping up"
+     width="400" />
     <check_box
      control_name="TranslateChat"
      enabled="true"
@@ -488,4 +518,4 @@
          name="Korean"
          value="ko" />
     </combo_box>
-</panel>
+</panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 2a869d52f189a31c185b93f6425dd3e3dd8e927f Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Tue, 28 Sep 2010 14:14:10 -0400
Subject: update for STORM-255 to correct small issue with tool tip in
 pannel_preferences_chat.xml

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 3adc174aaf..e36415832c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -366,7 +366,7 @@
      name="chat_window"
      top_pad="0"
      tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)"
-     width="331">
+     width="150">
      <radio_item
       height="16"
       label="Separate windows"
-- 
cgit v1.2.3


From ea7420a7b3e1f68b8eb78a6e8ebd13683f7716b9 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 19 Oct 2010 20:59:08 +0300
Subject: STORM-293 FIXED Friend permissions icons overlap long names on 'My
 Friends' tab

- Added 'avatar name right padding' as parameter to avatar_list_item.
  Before it was calculated and correctness of calculation was strongly dependent on right positioning elements in XML, which was prone to errors.
---
 indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
index ed8df69bf4..1bb3188cc8 100644
--- a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <avatar_list_item
+ name_right_pad="5"
  height="0"
  layout="topleft"
  left="0"
-- 
cgit v1.2.3


From 6da1e54e6a8b66a2cad7c8c89de279ca5b9ac7dd Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Mon, 25 Oct 2010 11:43:50 -0400
Subject: Inverting settings and test so that telling other how to turn off the
 messages popping is easier as per discussion with Oz and Boroondas also
 correcting some minor spelling issues

---
 .../skins/default/xui/en/panel_preferences_chat.xml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index e36415832c..77f3405ed9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -394,27 +394,27 @@
      left="280" 
      height="10"
      width="180">
-      Disable incoming notifications:
+      Enable Incoming Messages:
       </text>
     <check_box
-     control_name="DisableGroupToast"
-     name="DisableGroupToast"
+     control_name="EnableGroupToast"
+     name="EnableGroupToast"
      label="Group chats" 
      layout="topleft"
      top_delta="18" 
      left="295" 
      height="20"
-     tool_tip="Checking this will turn off Group Toasts poping up"
+     tool_tip="Checking this will turn on Group Messages popping up"
      width="400" />
     <check_box
-     control_name="DisableIMToast"
-     name="DisableIMToast"
+     control_name="EnableIMToast"
+     name="EnableIMToast"
      label="Im chats" 
      layout="topleft"
      top_delta="22" 
      left="295" 
      height="20"
-     tool_tip="Checking this will turn off IM Chat Toasts poping up"
+     tool_tip="Checking this will turn on IM Chat Messages popping up"
      width="400" />
     <check_box
      control_name="TranslateChat"
-- 
cgit v1.2.3


From 8bef9cc8137dc58b818c60dd1173959fcab40bd8 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Tue, 26 Oct 2010 09:32:56 -0400
Subject: Correction to pannel_preferences_chat.xml os it reads 'IM chat'
 instead of Im chat'

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 77f3405ed9..45d7633f73 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -409,7 +409,7 @@
     <check_box
      control_name="EnableIMToast"
      name="EnableIMToast"
-     label="Im chats" 
+     label="IM chats" 
      layout="topleft"
      top_delta="22" 
      left="295" 
-- 
cgit v1.2.3


From b2a6f4853b550af68a6f4487db00663639e20b38 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 26 Oct 2010 18:15:30 +0300
Subject: STORM-36 FIXED As a User, I want to control how long a chat toast
 appears before it fades. Please add fade time back to Chat preferences.

- Added two spinners to the Chat preferences tab that control NearbyToastLifeTime and NearbyToastFadingTime
- Added callbacks to the LLNearbyChatScreenChannel that update these properties if they were changed

Refactoring of LLToast:
- Removed code that was making toast transparent from LLToast::draw()
- Modified LLToast interface that relates to showing and hiding toast, so that all screen channels can use LLToast universally.
- Replaced in LLScreenChannel calling methods of old interface to new ones.
---
 .../default/xui/en/panel_preferences_chat.xml      | 34 +++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 31e160ec33..c009fd2931 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -308,6 +308,38 @@
      width="95">
         URLs
     </text>
+    <spinner
+     control_name="NearbyToastLifeTime"
+     decimal_digits="0"
+     follows="left|top"
+     height="23"
+     increment="1"
+     initial_value="23"
+     label="Nearby chat toasts life time:"
+     label_width="190"
+     layout="topleft"
+     left="290"
+     max_val="60"
+     min_val="1"
+     name="nearby_toasts_lifetime"
+     top_pad="33"
+     width="210" />
+    <spinner
+     control_name="NearbyToastFadingTime"
+     decimal_digits="0"
+     follows="left|top"
+     height="23"
+     increment="1"
+     initial_value="3"
+     label="Nearby chat toasts fading time:"
+     label_width="190"
+     layout="topleft"
+     left_delta="00"
+     max_val="60"
+     min_val="0"
+     name="nearby_toasts_fadingtime"
+     top_pad="15"
+     width="210" />
     <check_box
      control_name="PlayTypingAnim"
      height="16"
@@ -316,7 +348,7 @@
      layout="topleft"
      left="30"
      name="play_typing_animation"
-     top_pad="32"
+     top="205"
      width="400" />
     <check_box
      enabled="false"
-- 
cgit v1.2.3


From 24d932aa829d9bfda691463e8079278b951c50ed Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 26 Oct 2010 19:20:09 +0300
Subject: STORM-354 FIXED [TRUNCATION] many langs - build tools "Click to:"
 combobox

- Increased width of label and decreased width of checkbox in EN locale

- Removed overrides of width dimensions in EN, ES, NL, FR locales
---
 indra/newview/skins/default/xui/en/floater_tools.xml | 4 ++--
 indra/newview/skins/default/xui/es/floater_tools.xml | 4 ++--
 indra/newview/skins/default/xui/fr/floater_tools.xml | 2 +-
 indra/newview/skins/default/xui/nl/floater_tools.xml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 4c508035be..e25cef1ef7 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -965,7 +965,7 @@
              top_pad="10"
              left="10"
              name="label click action"
-             width="98">
+             width="118">
                 Click to:
             </text>
             <combo_box
@@ -973,7 +973,7 @@
              height="23"
              layout="topleft"
              name="clickaction"
-             width="168"
+             width="148"
              left_pad="0">
                 <combo_box.item
                  label="Touch  (default)"
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 9867f1b575..249e9e0913 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -186,10 +186,10 @@
 			<button label="Configurar..." label_selected="Configurar..." name="button set group" tool_tip="Elige un grupo con el que compartir los permisos de este objeto"/>
 			<check_box label="Compartir" name="checkbox share with group" tool_tip="Permite que todos los miembros del grupo compartan tus permisos de modificación en este objeto. Debes transferirlo para activar las restricciones según los roles."/>
 			<button label="Transferir" label_selected="Transferir" name="button deed" tool_tip="La transferencia entrega este objeto con los permisos del próximo propietario. Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
-			<text name="label click action" width="180">
+			<text name="label click action">
 				Al tocarlo:
 			</text>
-			<combo_box name="clickaction" width="192">
+			<combo_box name="clickaction">
 				<combo_box.item label="Tocarlo (por defecto)" name="Touch/grab(default)"/>
 				<combo_box.item label="Sentarse en el objeto" name="Sitonobject"/>
 				<combo_box.item label="Comprar el objeto" name="Buyobject"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 666aaa8147..8a128c0308 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -189,7 +189,7 @@
 			<text name="label click action">
 				Cliquer pour :
 			</text>
-			<combo_box name="clickaction" width="178">
+			<combo_box name="clickaction">
 				<combo_box.item label="Toucher (par défaut)" name="Touch/grab(default)"/>
 				<combo_box.item label="S&apos;asseoir sur l&apos;objet" name="Sitonobject"/>
 				<combo_box.item label="Acheter l&apos;objet" name="Buyobject"/>
diff --git a/indra/newview/skins/default/xui/nl/floater_tools.xml b/indra/newview/skins/default/xui/nl/floater_tools.xml
index 212cac0a5b..b72e4d4681 100644
--- a/indra/newview/skins/default/xui/nl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/nl/floater_tools.xml
@@ -144,7 +144,7 @@
 			<text name="label click action">
 				Wanneer links-geklikt:
 			</text>
-			<combo_box name="clickaction" width="178">
+			<combo_box name="clickaction">
 				<combo_box.item name="Touch/grab(default)" label="Aanraken/pakken (standaard)"
 				/>
 				<combo_box.item name="Sitonobject" label="Zit op object"
-- 
cgit v1.2.3


From 217dd122947b90be74ab748e1fb3368bee2eb04d Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 26 Oct 2010 19:57:49 +0300
Subject: STORM-190 FIXED [TRUNCATION] many langs -- "Next Owner:" in
 floatear_bulk_perms.xml

- Increased width of the floater and spacing between controls for which truncation occurs

- Deleted wrong override for width dimension in JA locale
---
 .../skins/default/xui/en/floater_bulk_perms.xml    | 22 +++++++++++-----------
 .../skins/default/xui/ja/floater_bulk_perms.xml    |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 457142f11c..4e0cfb0cd4 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -7,7 +7,7 @@
  name="floaterbulkperms"
  help_topic="floaterbulkperms"
  title="EDIT CONTENT PERMISSIONS"
- width="300">
+ width="410">
     <floater.string
      name="nothing_to_modify_text">
         Selection contains no editable contents.
@@ -71,7 +71,7 @@
      control_name="BulkChangeIncludeGestures"
      height="16"
      name="check_gesture"
-     left="65"
+     left="95"
      width="16"
      top="25" />
     <icon
@@ -87,7 +87,7 @@
      height="16"
      layout="topleft"
      name="check_notecard"
-     left="65"
+     left="95"
      width="16"
      top_pad="5" />
     <icon
@@ -102,7 +102,7 @@
      control_name="BulkChangeIncludeObjects"
      height="16"
      name="check_object"
-     left="65"
+     left="95"
      top_pad="5"
      width="16" />
    <icon
@@ -117,7 +117,7 @@
      height="16"
      name="check_script"
      top="25"
-     left="120"
+     left="180"
      width="16"
      />
     <icon
@@ -133,7 +133,7 @@
      height="16"
      name="check_sound"
      top_pad="5"
-     left="120"
+     left="180"
      width="16" />
     <icon
      height="16"
@@ -147,7 +147,7 @@
      height="16"
      name="check_texture"
      top_pad="5"
-     left="120"
+     left="180"
      width="16" />
     <icon
      height="16"
@@ -162,7 +162,7 @@
     layout="topleft"
    name="check_all"
      label="√ All"
-     left="180"
+     left="290"
      top="26"
      width="115">
       <button.commit_callback
@@ -221,7 +221,7 @@
      height="28"
      layout="topleft"
      name="AnyoneLabel"
-     left="104"
+     left="124"
      top="110"
      width="92"
      word_wrap="true">
@@ -243,7 +243,7 @@
      layout="topleft"
      name="NextOwnerLabel"
      top="110"
-     left="189"
+     left="275"
      width="92"
      word_wrap="true">
         Next owner:
@@ -292,7 +292,7 @@
      height="23"
      label="OK"
      layout="topleft"
-     left="95"
+     left="205"
      name="apply"
      top_pad="10"
      width="90">
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index be24960c6e..d8d0164618 100644
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -43,7 +43,7 @@
 		全員：
 	</text>
 	<check_box label="コピー" name="everyone_copy"/>
-	<text name="NextOwnerLabel" left="160">
+	<text name="NextOwnerLabel">
 		次の所有者：
 	</text>
 	<check_box label="修正" name="next_owner_modify"/>
-- 
cgit v1.2.3


From ff8f1701eff57c9d836e86970ca951b8c75cb0dd Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Tue, 26 Oct 2010 20:55:31 +0300
Subject: STORM-335 FIXED Made group name clickable in About Land > General
 tab.

Technical notes:
If you set the "enabled" param of a textbox to "false", that will prevent the widget from receiving mouse events.
However, if a text box is initially enabled and then gets disabled with setEnabled(FALSE), it will remain clickable.
This is a long-standing design problem with "enabled" flag being intermixed with "read-only".
I'm working around it by enabling the group name textbox initially, thus making it clickable.
---
 indra/newview/skins/default/xui/en/floater_about_land.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins')

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 89ed16e7c2..3b7a5aa20c 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -255,7 +255,6 @@
             </text>
    <!--TODO: HOOK UP GROUP ICON-->
             <text
-             enabled="false"
              follows="left|top"
              height="16"
              left_pad="2"
-- 
cgit v1.2.3


From f9078ce5ccd805c0e18b68fb767eea6b59314bc1 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 27 Oct 2010 11:52:52 +0300
Subject: STORM-400 FIXED Trash button not responding on People > My Friends
 tab

- Corrected wrong button name in XML
---
 indra/newview/skins/default/xui/en/panel_people.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index d34c0c29a8..68c423d7dd 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -307,7 +307,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 				           image_unselected="Toolbar_Right_Off"
 				           left="0"
 				           layout="topleft"
-				           name="trash_btn"
+				           name="del_btn"
 				           tool_tip="Remove selected person from your Friends list"
 				           top="0"
 				           width="31"/>
-- 
cgit v1.2.3


From 379f9b824087a44f7ffab0becfafaa29611751be Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Wed, 27 Oct 2010 11:00:39 -0400
Subject: Made changes to setting names and in pannel_preferences_chat.xml for
 better understanding  as per Esbee's comments in STORM-255

---
 .../skins/default/xui/en/panel_preferences_chat.xml        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 45d7633f73..e8f36b5298 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -394,12 +394,12 @@
      left="280" 
      height="10"
      width="180">
-      Enable Incoming Messages:
+      Enable Incoming Chat popups:
       </text>
     <check_box
-     control_name="EnableGroupToast"
-     name="EnableGroupToast"
-     label="Group chats" 
+     control_name="EnableGroupChatPopups"
+     name="EnableGroupChatPopups"
+     label="Group Chats" 
      layout="topleft"
      top_delta="18" 
      left="295" 
@@ -407,9 +407,9 @@
      tool_tip="Checking this will turn on Group Messages popping up"
      width="400" />
     <check_box
-     control_name="EnableIMToast"
-     name="EnableIMToast"
-     label="IM chats" 
+     control_name="EnableIMChatPopups"
+     name="EnableIMChatPopups"
+     label="IM Chats" 
      layout="topleft"
      top_delta="22" 
      left="295" 
-- 
cgit v1.2.3


From 23a217c66717912b99bc4c54cc8028fb7027e1be Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 27 Oct 2010 22:54:39 +0300
Subject: STORM-451 FIXED Disabled highlighting URLs in object name inside the
 llGiveInventory discard notification.

Changes:
 * Wrapped object name with <nolink>...</nolink> tags to disable URL parsing.
 * The decline message is now localized as a whole sentence (localizing separate phrases is often inapplicable for some languages).
---
 indra/newview/skins/default/xui/en/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(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 403d976350..5d3f19edcf 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2242,8 +2242,7 @@ Clears (deletes) the media and all params from the given face.
 	<string name="InvOfferOwnedBy">owned by</string>
 	<string name="InvOfferOwnedByUnknownUser">owned by an unknown user</string>
 	<string name="InvOfferGaveYou">gave you</string>
-	<string name="InvOfferYouDecline">You decline</string>
-	<string name="InvOfferFrom">from</string>
+	<string name="InvOfferDecline">You decline [DESC] from &lt;nolink&gt;[NAME]&lt;/nolink&gt;.</string>
 
 	<!-- group money -->
 	<string name="GroupMoneyTotal">Total</string>
-- 
cgit v1.2.3


From ea2406b6a50a6f14c253b26a17777ef92115eca8 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 1 Nov 2010 14:29:54 -0700
Subject: changing duplicate line editor name

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
index 7a3fb9334a..9a9fd32a77 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -63,7 +63,7 @@
        width="300"
        height="20"
       font="SansSerif"
-    name="set_name_label">
+    name="name_confirm_label">
       Type your new name again to confirm:
     </text>
     <line_editor
-- 
cgit v1.2.3


From d3bc9b3e752935bffc5e808fd41a43af45568788 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Mon, 1 Nov 2010 22:29:09 -0400
Subject: STORM-255 : Made changes to the tool tips for the check boxes  in
 panel_prefferences_chat.xml

---
 indra/newview/skins/default/xui/en/panel_preferences_chat.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_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 8a20c3cb16..85824c2576 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -436,7 +436,7 @@
      top_delta="18" 
      left="295" 
      height="20"
-     tool_tip="Checking this will turn on Group Messages popping up"
+     tool_tip="Check to see popups when a Group Chat message arrives"
      width="400" />
     <check_box
      control_name="EnableIMChatPopups"
@@ -446,7 +446,7 @@
      top_delta="22" 
      left="295" 
      height="20"
-     tool_tip="Checking this will turn on IM Chat Messages popping up"
+     tool_tip="Check to see popups when an instant message arrives"
      width="400" />
     <check_box
      control_name="TranslateChat"
-- 
cgit v1.2.3