merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 94 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
new file mode 100644
index 0000000000..174337480a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ height="250"
+ layout="topleft"
+ min_height="150"
+ min_width="200"
+ name="floater_buy_contents"
+ save_rect="true"
+ title="Buy Contents"
+ width="300">
+    <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>
+    <text
+     type="string"
+     length="1"
+     follows="left|top|right"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left="15"
+     name="contains_text"
+     top="24"
+     width="281">
+        [NAME] contains:
+    </text>
+    <scroll_list
+     follows="left|top|right|bottom"
+     height="148"
+     layout="topleft"
+     left_delta="0"
+     name="item_list"
+     top_pad="4"
+     width="281">
+        <scroll_list.columns
+         name="icon"
+         width="16" />
+        <scroll_list.columns
+         name="text"
+         relative_width="1" />
+    </scroll_list>
+    <text
+     type="string"
+     length="1"
+     follows="left|right|bottom"
+     font="SansSerif"
+     height="24"
+     layout="topleft"
+     left_delta="0"
+     name="buy_text"
+     top_pad="4"
+     width="281">
+        Buy for L$[AMOUNT] from [NAME]?
+    </text>
+    <button
+     follows="right|bottom"
+     height="20"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     left="216"
+     name="cancel_btn"
+     top="224"
+     width="60" />
+    <button
+     follows="right|bottom"
+     height="20"
+     label="Buy"
+     label_selected="Buy"
+     layout="topleft"
+     left_delta="-64"
+     name="buy_btn"
+     top_delta="0"
+     width="60" />
+    <check_box
+     follows="left|bottom"
+     height="20"
+     label="Wear clothing now"
+     layout="topleft"
+     left_delta="-139"
+     name="wear_check"
+     top_delta="0"
+     width="135" />
+</floater>