summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2010-04-20 13:46:43 +0300
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2010-04-20 13:46:43 +0300
commitf260d52c75ee9b0d3c6fc1b081b6ae0d19641f9e (patch)
tree24e1e0090f0bba664b1e778107e5c9332f63f471 /indra/newview/skins
parent1ce1e7f9a121cad473c84fced770837da9e6e55c (diff)
Fixed EXT-6930(normal) - Edit Outfit: "Add wearables" panel layout is broken.
NOTE: this is a temporary fix, see EXT-6564(Fix wearable editing panels) for more info. Fix info: - Moved edit wearable button to place where it does not break widget paddings. - Updated code that calculates button position. - Sending button to front to ensure it is clickable and visible. Not reviewed. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfit_edit.xml26
1 files changed, 15 insertions, 11 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 bc37af0319..c77e4e8d5e 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -30,6 +30,20 @@
<string name="Filter.Clothes/Body" value="Clothes/Body"/>
<string name="Filter.Objects" value="Objects"/>
+ <!--
+ TODO remove this button. Added it temporary for QA to be able to test new edit wearable
+ panel (see EXT-6564)
+ -->
+ <button
+ follows="left|top|right"
+ height="20"
+ label="edit"
+ left="0"
+ top="0"
+ layout="topleft"
+ name="edit_wearable_btn"
+ width="40" />
+
<button
follows="top|left"
height="23"
@@ -158,18 +172,8 @@
sort_column="look_item_sort"
name="look_item_sort" />
</scroll_list>
- <!-- TODO remove this button. Added it temporary for QA to be able to test new edit wearable panel (see EXT-6564)-->
- <button
- follows="left|top|right"
- height="20"
- label="edit"
- left="0"
- top="0"
- layout="topleft"
- name="edit_wearable_btn"
- width="40" />
- <panel
+ <panel
background_visible="true"
bevel_style="none"
follows="bottom|left|right"