summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_edit_pick.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-01-24 16:21:34 -0500
committerOz Linden <oz@lindenlab.com>2012-01-24 16:21:34 -0500
commitb2f77bee7ea98f5a4ff59e00095b5b3aff11e35b (patch)
tree7695bb632502f24325f7044c69e30946e767abce /indra/newview/skins/default/xui/en/panel_edit_pick.xml
parent79f1cd0a73bd86ff545ad78b9b1878e350d77416 (diff)
parentea6cbc7b6b1de051a9bb1c311c4399a2b4d42cb3 (diff)
merge changes for vmrg-217
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.xml2
1 files changed, 0 insertions, 2 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 2ec2e03e8c..0faa1598b1 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -201,7 +201,6 @@
layout="topleft"
left="0"
name="layout_panel1"
- user_resize="false"
auto_resize="true"
width="150">
<button
@@ -221,7 +220,6 @@
layout="topleft"
left_pad="4"
name="layout_panel2"
- user_resize="false"
auto_resize="true"
width="146">
<button