From 5cc02625fb15203cec8584aa19dd8d2240ab8eca Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 19 Feb 2010 12:17:35 +0200
Subject: Fixed low bug EXT-5523 - Bottom part of "Create classfield dialog"is
 overlapped by unnecessary scroller Copied reshape logic from Picks panel to
 reshape Classified panel.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_edit_classified.xml       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index cc09835049..d31e7d2ed8 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -61,11 +61,11 @@
      background_visible="false"
      height="600"
      left="0"
-     width="295">
+     width="285">
     <texture_picker
      follows="left|top|right"
      height="197"
-     width="286"
+     width="272"
      layout="topleft"
      top="10"
      left="11"
@@ -92,7 +92,7 @@
          top="215"
          name="Name:"
          text_color="white"
-         width="290">
+         width="280">
             Title:
         </text>
         <line_editor
@@ -106,7 +106,7 @@
          name="classified_name"
          prevalidate_callback="ascii"
          text_color="black"
-         width="290" />
+         width="273" />
         <text
          type="string"
          length="1"
@@ -119,13 +119,13 @@
          top_pad="20"
          name="description_label"
          text_color="white"
-         width="290">
+         width="280">
             Description:
         </text>
         <text_editor
          follows="left|top|right"
          height="100"
-         width="290"
+         width="273"
          hide_scrollbar="false"
          layout="topleft"
          left="10"
@@ -146,7 +146,7 @@
          name="location_label"
          text_color="white"
          top_pad="20"
-         width="290">
+         width="280">
             Location:
         </text>
         <text
@@ -159,7 +159,7 @@
          name="classified_location"
          right="-10"
          top_pad="2"
-         width="290"
+         width="280"
          word_wrap="true">
             loading...
         </text>
-- 
cgit v1.2.3


From 5ea72c3087fe7a45da90437b8ff2a6ba0759ceb4 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 19 Feb 2010 16:13:15 +0200
Subject: Fixed major bug EXT-5445 - Pop-ups (that replace the blue ones)
 should not steal focus. LLScriptFloater will no longer steal focus when
 opened.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_script.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index 984c4fcf1d..663899d4b3 100644
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
@@ -10,7 +10,7 @@
  top="0"
  can_dock="true"
  can_minimize="true"
- visible="true" 
+ visible="false" 
  width="520"
  can_resize="false"
  min_width="350"
-- 
cgit v1.2.3


From 857ba2f534564e1e3c5c167f2215c4986885f560 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Fri, 19 Feb 2010 18:02:24 +0200
Subject: =?UTF-8?q?EXT-5101=20=E2=80=9CNo=20feedback=20provided=20when=20a?=
 =?UTF-8?q?ccepting=20a=20friend=20request=E2=80=9D,=20replaced=20log=20te?=
 =?UTF-8?q?xt=20"Friend=20request"=20with=20"Friendship=20offer".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4fa5d965c8..8f1812830f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5210,14 +5210,14 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th
    icon="notify.tga"
    name="FriendshipAcceptedByMe"
    type="offer">
-Friend request accepted.
+Friendship offer accepted.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FriendshipDeclinedByMe"
    type="offer">
-Friend request declined.
+Friendship offer declined.
   </notification>
   
   <notification
-- 
cgit v1.2.3


From 0b8be887de8e801aa1f4bb1dc1d94c1ac5fd58ef Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Fri, 19 Feb 2010 19:51:07 +0200
Subject: Fixed low bug EXT-5568 (The Speak button label hides after bottom
 tray width decreased.)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 2b361c0628..088f098f85 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -9,7 +9,7 @@
  top="21"
  width="310">
     <string name="min_width">
-        188
+        216
     </string>
     <string name="max_width">
         320
-- 
cgit v1.2.3


From a8e9f7ab5010bd4f9d80fbd0002a16bcb802716c Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Sat, 20 Feb 2010 01:07:52 +0200
Subject: Fixed major (EXT-5551) Duplicated xui xml IDs to fix, 2010/2/19.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index c371b19fc5..c9752cf913 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -316,7 +316,7 @@
      height="20"
      layout="topleft"
      left="25"
-     name="Listen from"
+     name="voice_chat_settings"
      width="200"
      top="210">
 	  Voice Chat Settings
-- 
cgit v1.2.3