summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_picks.xml
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-27 17:22:26 -0700
committerRichard Linden <none@none>2011-10-27 17:22:26 -0700
commit6e8ffc247fe52668446b8fa1ed7f1547a755076f (patch)
tree23b6fa5ce6bf6a32944faca54f9a18aca255fd75 /indra/newview/skins/default/xui/en/panel_picks.xml
parent0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (diff)
parentfcd1ccd21e3ea8f0944537347dd6c9d7972d50ce (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_picks.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_picks.xml17
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 87e263726d..85f402dfa2 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -4,12 +4,12 @@ bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true"
follows="all"
- height="548"
+ height="571"
label="Picks"
layout="topleft"
- left="0"
+ left="8"
name="panel_picks"
- top="0"
+ top_pad="0"
width="313">
<string
name="no_picks"
@@ -30,7 +30,7 @@ bg_opaque_color="DkGray2"
<accordion
fit_parent="true"
follows="all"
- height="485"
+ height="514"
layout="topleft"
left="0"
name="accordion"
@@ -81,10 +81,10 @@ bg_opaque_color="DkGray2"
left="1"
height="27"
label="bottom_panel"
- layout="bottom"
+ layout="topleft"
name="edit_panel"
- top_pad="-2"
- width="313">
+ top_pad="0"
+ width="312">
<layout_stack
follows="bottom|left|right"
@@ -149,8 +149,9 @@ bg_opaque_color="DkGray2"
follows="bottom|left|right"
layout="topleft"
left="0"
- height="40"
+ height="30"
name="buttons_cucks"
+ top_pad="0"
width="313">
<layout_stack