From 482eefcba94dac0e6a0e6f9985f582e724b02523 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Thu, 4 Feb 2010 12:39:13 +0200
Subject: fix for task EXT-4750 Disable "Join" dialog for free groups also add
 group name to notification - more informative...

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 636db2b59b..7cc4af53f8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -411,6 +411,19 @@ Do you wish to proceed?
      yestext="Join"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="JoinGroupNoCost"
+   type="alertmodal">
+You are Joining group [NAME].
+Do you wish to proceed?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Join"/>
+  </notification>
+
+
   <notification
    icon="alertmodal.tga"
    name="JoinGroupCannotAfford"
-- 
cgit v1.2.3


From 667ae0b9a31318d43d36cb6c8cb73a83e1470009 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 4 Feb 2010 15:54:56 +0200
Subject: Fixed critical bug EXT-4845 (Create padding around text messages in
 the side tray panels) - moved "No Items" textbox params to widget
 (flat_list_view.xml) - set default vertical/horizontal padding to 10 px -
 they can be overridden in panel's xml if necessary.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml           |  2 ++
 indra/newview/skins/default/xui/en/widgets/flat_list_view.xml | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 3b5add33a8..447ac1b123 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -137,6 +137,7 @@ background_visible="true"
                         <avatar_list
                          allow_select="true"
                          follows="all"
+                         height="235"
                          layout="topleft"
                          left="0"
                          multi_select="true"
@@ -152,6 +153,7 @@ background_visible="true"
                         <avatar_list
                          allow_select="true"
                          follows="all"
+                         height="235"
                          layout="topleft"
                          left="0"
                          multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
index 888b4eaf7c..a71b293f31 100644
--- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
@@ -5,4 +5,12 @@
  item_pad="0"
  keep_one_selected="true"
  multi_select="false"
- opaque="true" />
\ No newline at end of file
+ opaque="true">
+    <flat_list_view.no_items_text
+     follows="all"
+     name="no_items_msg"
+     v_pad="10"
+     h_pad="10"
+     value="There are no any items in the list"
+     wrap="true" />
+</flat_list_view>
\ No newline at end of file
-- 
cgit v1.2.3


From 36a44ba0e9133e78cc66f7d0b65d0890cfeb3db5 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Thu, 4 Feb 2010 15:37:25 +0200
Subject: fix for normal EXT-1888 Apply button remains active after Applying
 changes

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 15655a920e..05deca705a 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -56,7 +56,7 @@
          help_topic="preferences_general_tab"
          name="general" />
         <panel
-	 class="panel_preference"
+	 class="panel_preference_graphics"
          filename="panel_preferences_graphics1.xml"
          label="Graphics"
          layout="topleft"
-- 
cgit v1.2.3


From 79bcb8dc723d093e92bb5897e42c48e26b0bbf4e Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Feb 2010 15:44:45 +0200
Subject: Fixed low bug EXT-4951 - Redundant edit box context menu in list
 items in Panel Picks/Classifieds

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 023b1fc81d..e62c1278f9 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="picture_descr"
+     textbox.mouse_opaque="false" 
      top_pad="0"
      width="178"
      word_wrap="true" />
-- 
cgit v1.2.3


From a7141017afb8b13fe9d4758dfe502cc28966310f Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 4 Feb 2010 16:27:22 +0200
Subject: =?UTF-8?q?fixed=20EXT-4905=20=E2=80=9CDuplicated=20text=20in=20te?=
 =?UTF-8?q?leport=20notification=E2=80=9D?=
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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5d78cfc9ef..d16474873f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1532,7 +1532,7 @@ Your search terms were too short so no search was performed.
    icon="alertmodal.tga"
    name="CouldNotTeleportReason"
    type="alertmodal">
-Could not teleport.
+Teleport failed.
 [REASON]
   </notification>
 
-- 
cgit v1.2.3


From 9a15ee8a91a12020b22625873c280837739f946c Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Thu, 4 Feb 2010 10:00:33 -0500
Subject: Removed aspect ratio controls.
 http://jira.secondlife.com/browse/EXT-3908

---
 .../default/xui/en/panel_preferences_advanced.xml  | 57 ----------------------
 1 file changed, 57 deletions(-)

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

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 4d14d46743..05a3771edf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -266,61 +266,4 @@ Automatic position for:
           <button.commit_callback
           function="Pref.VoiceSetMiddleMouse" />
     </button>
-       <text
-     follows="left|top"
-     type="string"
-     length="1"
-     height="13"
-     layout="topleft"
-     left="30"
-     top_pad="8"
-     name="AspectRatioLabel1"
-     tool_tip="width / height"
-     label_width="50"
-     width="120">
-        Aspect ratio
-    </text>
-    <combo_box
-     allow_text_entry="true"
-     height="23"
-     follows="left|top"
-     layout="topleft"
-     left="80"
-     max_chars="100"
-     name="aspect_ratio"
-     tool_tip="width / height"
-     width="150">
-        <combo_box.item
-         enabled="true"
-         label=" 4:3 (Standard CRT)"
-         name="item1"
-         value="1.333333" />
-        <combo_box.item
-         enabled="true"
-         label=" 5:4 (1280x1024 LCD)"
-         name="item2"
-         value="1.25" />
-        <combo_box.item
-         enabled="true"
-         label=" 8:5 (Widescreen)"
-         name="item3"
-         value="1.6" />
-        <combo_box.item
-         enabled="true"
-         label=" 16:9 (Widescreen)"
-         name="item4"
-         value="1.7777777" />
-    </combo_box>
-    <check_box
-     control_name="FullScreenAutoDetectAspectRatio"
-     follows="left|top"
-     height="25"
-     label="Automatic"
-     layout="topleft"
-     left_pad="10"
-     name="aspect_auto_detect"
-     width="256">
-        <check_box.commit_callback
-         function="Pref.AutoDetectAspect" />
-    </check_box>
 </panel>
-- 
cgit v1.2.3


From c99fb12b3d300705dbf6eb68b1a3f22927d4d221 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Feb 2010 17:25:30 +0200
Subject: Update for low bug EXT-4951 - Redundant edit box context menu in list
 items in Panel Picks/Classifieds Disabled edit box context menu in classified
 list items.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index b881719e3a..0c1418fc2d 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="description"
+     textbox.mouse_opaque="false" 
      top_pad="0"
      width="178"
      word_wrap="true" />
-- 
cgit v1.2.3