move base back to default because doing it as a backout was causing merge errors

1 files changed, 116 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
new file mode 100644
index 0000000000..f0e5e30010
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="290"
+ layout="topleft"
+ min_height="150"
+ min_width="200"
+ name="contents"
+ help_topic="contents"
+ save_rect="true"
+ single_instance="true"
+ title="BUY COPY OF OBJECT"
+ width="280">
+    <floater.string
+     name="title_buy_text">
+        Buy
+    </floater.string>
+    <floater.string
+     name="title_buy_copy_text">
+        Buy a copy of
+    </floater.string>
+    <floater.string
+     name="no_copy_text">
+        (no copy)
+    </floater.string>
+    <floater.string
+     name="no_modify_text">
+        (no modify)
+    </floater.string>
+    <floater.string
+     name="no_transfer_text">
+        (no transfer)
+    </floater.string>
+    <scroll_list
+     background_visible="true"
+     draw_border="false"
+     follows="left|top|right"
+     height="35"
+     layout="topleft"
+     name="object_list"
+     top="20"
+     left="10"
+     width="260">
+        <scroll_list.columns
+         name="icon"
+         width="16" />
+        <scroll_list.columns
+         name="text"
+         width="234" />
+    </scroll_list>
+    <text
+     type="string"
+     length="1"
+     follows="all"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="contents_text"
+     top_pad="5"
+     width="260">
+     Contains:
+    </text>
+    <scroll_list
+     background_visible="true"
+     draw_border="false"
+     follows="all"
+     height="145"
+     layout="topleft"
+     left_delta="0"
+     name="item_list"
+     top_pad="4"
+     width="260">
+        <scroll_list.columns
+         name="icon"
+         width="16" />
+        <scroll_list.columns
+         name="text"
+         width="234" />
+    </scroll_list>
+    <text
+     type="string"
+     length="1"
+     follows="left|right|bottom"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left_delta="0"
+     name="buy_text"
+     text_color="white"
+     top_pad="5"
+     width="276">
+        Buy for L$[AMOUNT] from [NAME]?
+    </text>
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Buy"
+     label_selected="Buy"
+     layout="topleft"
+     left="65"
+     name="buy_btn"
+     top_pad="10"
+     width="100" />
+    <button
+     follows="right|bottom"
+     height="23"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="cancel_btn"
+     top_delta="0"
+     width="100" />
+</floater>