diff options
author | Eli Linden <eli@lindenlab.com> | 2010-10-11 16:05:09 -0700 |
---|---|---|
committer | Eli Linden <eli@lindenlab.com> | 2010-10-11 16:05:09 -0700 |
commit | 418cb8689f54def3377369842b3635ad28013374 (patch) | |
tree | eb013c708fb4635f8be061f1da305c032db17cbb /indra/newview/skins | |
parent | 2a8de5a952bc5072ed9bb85b147e7d9af42ccb41 (diff) | |
parent | f90befad07c5868d6e1a2c439347d0590437be62 (diff) |
Merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_media_browser.xml | 3 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_land_money.xml | 12 |
2 files changed, 11 insertions, 4 deletions
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" 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" |