summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_edit_pick.xml
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-10-19 02:17:01 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-10-19 02:17:01 +0000
commitea1bfae838c59e24ec1a962f7d015d609b63d083 (patch)
tree4fb1bc94522313df13a6d329cd8fef29d099a46d /indra/newview/skins/default/xui/en/panel_edit_pick.xml
parent8103710c054ec6ea4a46f9732e569e543691184b (diff)
Merging revisions 2070-2084 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241 * Dev: EXT-1271 EXT-1601 EXT-1154
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_edit_pick.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_pick.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 736a60cfe7..bac6f6e4d1 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -2,6 +2,7 @@
<panel
background_visible="true"
bevel_style="in"
+ follows="left|top|right|bottom"
height="570"
label="Edit Pick"
layout="topleft"
@@ -43,7 +44,7 @@
left="10"
top_pad="10"
name="profile_scroll"
- reserve_scroll_corner="true"
+ reserve_scroll_corner="false"
opaque="true"
width="313">
<panel