From 765b9a0a8eace57564fe2725d0377963b4c82bda Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 25 Feb 2010 15:06:04 +0200
Subject: Fixed major EXT - 5670 (Resident name tabs are blocked in the
 Conversation window)

- Removed the profile pictures in the tabs and swiched to the use of simple LLButton instead of LLCustomButtonIconCtrl

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 65a05f3ec5..0f098bbb52 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -22,9 +22,7 @@
      tab_width="64"
      tab_max_width = "134"
      tab_height="16"
-     use_custom_icon_ctrl="true"
-     tab_icon_ctrl_pad="2"
-     halign="left"
+     halign="center"
      use_ellipses="true"
      top="0"
      width="390" />
-- 
cgit v1.2.3


From bf25f3fd00c836a1ac3e6d160aa3d97634da084f Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 25 Feb 2010 16:37:31 +0200
Subject: Work on normal bug EXT-4518 (movement & camera floaters should have
 window titles) -- done for Move floater. -- deprecated comments cleaned up

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 0a5820ce73..520741186e 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -38,6 +38,18 @@
      name="fly_back_tooltip">
         Fly Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="walk_title">
+        Walk
+    </string>
+    <string
+     name="run_title">
+        Run
+    </string>
+    <string
+     name="fly_title">
+        Fly
+    </string>
     <panel
      border="false"
      height="83"
-- 
cgit v1.2.3


From f7916bb6ca7aa6513981c9ebbd2e2491145f8f0c Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 25 Feb 2010 17:43:51 +0200
Subject: Work on normal bug EXT-4518 (movement & camera floaters should have
 window titles) -- done for Camera floater. -- also updated tooltip for
 Presets button

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_camera.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index f69c763f78..b45e39a111 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -27,6 +27,22 @@
      name="move_tooltip">
         Move Camera Up and Down, Left and Right
     </floater.string>
+    <floater.string
+     name="orbit_mode_title">
+        Orbit
+    </floater.string>
+    <floater.string
+     name="pan_mode_title">
+        Pan
+    </floater.string>
+    <floater.string
+     name="avatar_view_mode_title">
+        Presets
+    </floater.string>
+    <floater.string
+     name="free_mode_title">
+        View Object
+    </floater.string>
     <panel
      border="false"
      height="110"
@@ -232,7 +248,7 @@
          image_selected="PushButton_Selected_Press"
          name="avatarview_btn"
          tab_stop="false"
-         tool_tip="See as avatar"
+         tool_tip="Presets"
          width="25">
         </button>
         <button
-- 
cgit v1.2.3


From 4d978eaf0a5f09e4758956cf41f4dcf2bafb9b42 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 25 Feb 2010 17:53:45 +0200
Subject: No ticket. Code cleanup: remove deprecated StopFlying button from the
 Move Floater. It uses separate button from Stand/Stop Flying panel

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_moveview.xml | 11 -----------
 1 file changed, 11 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 520741186e..8e2c57764b 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -191,16 +191,5 @@
          tool_tip="Flying mode"
          top="2"
          width="31" />
-        <button
-         visible="false"
-         follows="left|bottom"
-         height="20"
-         label="Stop Flying"
-         layout="topleft"
-         left="0"
-         name="stop_fly_btn"
-         tool_tip="Stop flying"
-         top="2"
-         width="115" />
     </panel>
 </floater>
-- 
cgit v1.2.3


From 087ea1cef62d383821e8e340551e757cb604b553 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 25 Feb 2010 18:47:28 +0200
Subject: Fixed normal bug (EXT-5748) Useless area on Place Profile panel. -
 Reduced unused size in Place Profile and Landmark Info panels.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 66070c028d..befeb182f9 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -89,13 +89,13 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="700"
+         height="630"
          layout="topleft"
          left="0"
          min_height="300"
          name="scrolling_panel"
          top="0"
-         width="285">
+         width="310">
             <texture_picker
              enabled="false"
          follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index b22dad5841..7672bd0799 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -174,13 +174,13 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="700"
+         height="532"
          layout="topleft"
          left="0"
          min_height="300"
          name="scrolling_panel"
          top="0"
-         width="285">
+         width="310">
             <texture_picker
              enabled="false"
          follows="left|top|right"
-- 
cgit v1.2.3


From a325df08987636b00a5e81f08ee1d2a532636d72 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Thu, 25 Feb 2010 19:39:16 +0200
Subject: Fixed bug EXT-5580 (Characters in Inventory Filter appear behind X).

Added configurable text right padding support to search_filter:
* When the Clear button is enabled
  (i.e. search_editor.clear_button_visible set to "true")
  the search_editor.clear_button.pad_left parameter determines the padding.
* Otherwise search_editor.text_pad_right is used.

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index a9a760b3a4..32e443a058 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -3,6 +3,7 @@
   clear_button_visible="false"
   search_button_visible="true"
   text_pad_left="6" 
+  text_pad_right="6" 
   select_on_focus="true"
   text_tentative_color="TextFgTentativeColor"
   background_image="TextField_Search_Off"
@@ -21,5 +22,6 @@
    image_unselected="Icon_Close_Foreground"
    image_selected="Icon_Close_Press"
    pad_right="4"
+   pad_left="4"
    width="16" />
 </search_editor>
-- 
cgit v1.2.3


From fa3dbae2cceffa8cdf8038d56eba3fac1bb67838 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Thu, 25 Feb 2010 20:07:47 +0200
Subject: fixed Normal Bug EXT-5675 Empty friends list mentions \"click\" where
 it should specify \"right-click\"

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index daab52f06a..2a475142d4 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -222,7 +222,7 @@
              top="10"
              width="293"
              wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or click on a user to add them as a friend.
+                To add friends try [secondlife:///app/search/people global search] or use right click on a user in world to add them as a friend.
 If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
              </text>
         </panel>
-- 
cgit v1.2.3


From 92facf86d6bf1a7acecdc6e536ac2ad7bcdfdd96 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Fri, 26 Feb 2010 11:42:59 +0200
Subject: Additional commit for EXT-5675. "in world" part of message has been
 removed to avoid misunderstanding.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 2a475142d4..f0186a46bb 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -222,7 +222,7 @@
              top="10"
              width="293"
              wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or use right click on a user in world to add them as a friend.
+                To add friends try [secondlife:///app/search/people global search] or use right click on a user to add them as a friend.
 If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
              </text>
         </panel>
-- 
cgit v1.2.3