summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorrichard <none@none>2009-12-14 14:33:48 -0800
committerrichard <none@none>2009-12-14 14:33:48 -0800
commit7f0e7a1fed2caa29b9950e3e5a638ba379a67de5 (patch)
tree2222ac8ad0907f7931ccee545f45ead1de77d429 /indra/newview/skins
parent36dae1c1a0ed1c3adeadd5043a9a64c23c31b3e0 (diff)
manually merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_item_info.xml36
1 files changed, 0 insertions, 36 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 31d3c7289b..e04af2bad6 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -492,40 +492,4 @@
Price: L$
</text-->
</panel>
- <panel
- height="25"
- layout="bottomright"
- help_topic="button_tab"
- name="button_panel"
- left="5"
- bottom="5"
- width="313">
- <button
- follows="bottom|left"
- height="25"
- label="Edit"
- layout="topleft"
- left="0"
- name="edit_btn"
- top="0"
- width="50" />
- <button
- follows="bottom|right"
- height="25"
- label="Cancel"
- layout="topleft"
- name="cancel_btn"
- right="-1"
- top="0"
- width="70" />
- <button
- follows="bottom|right"
- height="25"
- label="Save"
- layout="topleft"
- name="save_btn"
- left_pad="-135"
- top="0"
- width="60" />
- </panel>
</panel>