summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-02-02 14:26:33 -0500
committerOz Linden <oz@lindenlab.com>2012-02-02 14:26:33 -0500
commit5b2dbbadf70ee33bfd288b6384ae0d51715488b1 (patch)
tree48d7678fbbca7359db17b472e3233c1d2874828b /indra/newview/skins/default/xui/en/panel_outfit_edit.xml
parent03290257345c22f909cf1cfac3981e7e07820d21 (diff)
parent34408bed2644ff957502454f05c21c31fec90009 (diff)
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_outfit_edit.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index e1cd78bad8..b61f110e32 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -198,7 +198,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
height="154"
name="add_button_and_combobox"
width="311"
- user_resize="false"
visible="true">
<!-- List containing items from the COF and Base outfit -->
@@ -271,8 +270,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
height="30"
name="filter_panel"
width="311"
- visible="false"
- user_resize="false">
+ visible="false">
<filter_editor
background_image="TextField_Search_Off"
@@ -515,7 +513,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
left="0"
mouse_opaque="false"
name="save_btn_lp"
- user_resize="false"
auto_resize="true"
width="156">
<button
@@ -550,7 +547,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
left_pad="3"
mouse_opaque="false"
name="revert_btn_lp"
- user_resize="false"
auto_resize="true"
width="147">
<button