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

1 files changed, 152 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
new file mode 100644
index 0000000000..d09a0a0535
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="220"
+ layout="topleft"
+ name="Give Money"
+ help_topic="give_money"
+ save_rect="true"
+ width="225">
+    <string
+     name="payee_group">
+        Pay Group
+    </string>
+    <string
+     name="payee_resident">
+        Pay Resident
+    </string>
+   <icon
+     height="16"
+     width="16"
+     image_name="Generic_Person"
+     mouse_opaque="true"
+     name="icon_person"
+     tool_tip="Person"
+     top_pad="24"
+     left="10"
+     />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="7"
+     top_delta="3"
+     name="payee_name"
+     width="184">
+      [FIRST] [LAST]
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     halign="left"
+     height="14"
+     layout="topleft"
+     left="34"
+     name="object_name_label"
+     top_pad="0"
+     width="180">
+        Via object:
+    </text>
+   <icon
+     height="16"
+     width="16"
+     image_name="Inv_Object"
+     mouse_opaque="true"
+     name="icon_object"
+     tool_tip="Objects"
+     top_pad="0"
+     left="10"
+     />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="7"
+     name="object_name_text"
+     top_delta="3"
+     use_ellipses="true"
+     word_wrap="false"
+     width="188">
+        My awesome object with a really damn long name
+    </text>
+   <button
+     height="23"
+     label="L$1"
+     label_selected="L$1"
+     layout="topleft"
+     left="25"
+     name="fastpay 1"
+     top_pad="8"
+     width="80" />
+    <button
+     height="23"
+     label="L$5"
+     label_selected="L$5"
+     layout="topleft"
+     left_pad="15"
+     name="fastpay 5"
+     width="80" />
+    <button
+     height="23"
+     label="L$10"
+     label_selected="L$10"
+     layout="topleft"
+     left="25"
+     name="fastpay 10"
+     top_pad="8"
+     width="80" />
+    <button
+     height="23"
+     label="L$20"
+     label_selected="L$20"
+     layout="topleft"
+     left_pad="15"
+     name="fastpay 20"
+     width="80" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="14"
+     layout="topleft"
+     left="25"
+     name="amount text"
+     top_pad="8"
+     width="180">
+        Or, choose amount:
+    </text>
+    <line_editor
+     border_style="line"
+     follows="left|top|right"
+     height="21"
+     top_pad="0"
+     layout="topleft"
+     left="120"
+     max_length="9"
+     name="amount"
+     width="80" />
+    <button
+     enabled="false"
+     height="23"
+     label="Pay"
+     label_selected="Pay"
+     layout="topleft"
+     left="10"
+     name="pay btn"
+     top_pad="5"
+     width="100" />
+    <button
+     height="23"
+     label="Cancel"
+     label_selected="Cancel"
+     layout="topleft"
+     left_pad="5"
+     name="cancel btn"
+     width="100" />
+</floater>