From 637bcedf029bfbe4d31668834476bf972a97dd60 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Thu, 7 Oct 2010 17:12:49 +0300
Subject: FIXED STORM-302 Parcel lists scroll bar overlaps with other
 components if panel is undocked

- Added missing column to the xml of the scroll list

- Adjusted columns width to show all columns
---
 .../newview/skins/default/xui/en/panel_group_land_money.xml  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index 76f7484c68..64539f2134 100644
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
@@ -65,19 +65,23 @@
         <scroll_list.columns
          label="Parcel"
          name="name"
-         width="78" />
+         width="47" />
         <scroll_list.columns
          label="Region"
          name="location"
-         width="78" />
+         width="47" />
         <scroll_list.columns
          label="Type"
          name="type"
-         width="70" />
+         width="47" />
         <scroll_list.columns
          label="Area"
          name="area"
-         width="50" />
+         width="47" />
+        <scroll_list.columns
+         label="Hidden"
+         name="hidden"
+         width="47" />
     </scroll_list>
     <text
      type="string"
-- 
cgit v1.2.3


From a913e25fcc47c893c116e3a2a42449559bbcb8fe Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Sat, 9 Oct 2010 00:24:57 +0300
Subject: STORM-289 FIXED browser navigation bar layout to make it resize
 properly after minimize/restore. When floater media browser is minimized its
 button bars are shrunk to zero height and their height is not restored upon
 unminimizing because they have auto_resize disabled. Setting min_height for
 the button bars makes them restored with this height upon uminimizing the
 floater.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index c02d607586..1b21b97092 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -33,6 +33,7 @@
          height="20"
          layout="topleft"
          left="0"
+         min_height="20"
          name="nav_controls"
          top="400"
          user_resize="false"
@@ -106,6 +107,7 @@
          height="20"
          layout="topleft"
          left_delta="0"
+         min_height="20"         
          name="time_controls"
          top_delta="0"
          user_resize="false"
@@ -163,6 +165,7 @@
          height="20"
          layout="topleft"
          left_delta="0"
+         min_height="20"         
          name="parcel_owner_controls"
          top_delta="0"
          user_resize="false"
-- 
cgit v1.2.3