EXT-1145 Update layout of Buy/Pay/Open floaters

1 files changed, 71 insertions, 82 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
index ac5e4592b7..5f70f09a34 100644
--- a/indra/newview/skins/default/xui/en/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay.xml
@@ -1,130 +1,119 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_minimize="false"
- height="140"
+ height="185"
  layout="topleft"
  name="Give Money"
  help_topic="give_money"
  save_rect="true"
- width="300">
+ width="225">
+   <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerifBold"
+     height="18"
+     layout="topleft"
+     left="12"
+     name="payee_label"
+     top="7"
+     width="75">
+        Pay:
+    </text>
+   <icon
+     height="16"
+     width="16"
+     image_name="Generic_Person"
+     mouse_opaque="true"
+     name="icon_person"
+     tool_tip="Person"
+     top_pad="0"
+     left="10"
+     />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="16"
+     layout="topleft"
+     left_pad="7"
+     name="payee_name"
+     width="210">
+        [FIRST] [LAST]
+    </text>
     <button
-     height="20"
+     height="23"
      label="L$1"
      label_selected="L$1"
      layout="topleft"
-     left="108"
+     left="25"
      name="fastpay 1"
-     top="54"
+     top_pad="8"
      width="80" />
     <button
-     height="20"
+     height="23"
      label="L$5"
      label_selected="L$5"
      layout="topleft"
      left_pad="15"
      name="fastpay 5"
-     top_delta="0"
      width="80" />
     <button
-     height="20"
+     height="23"
      label="L$10"
      label_selected="L$10"
      layout="topleft"
-     left="108"
+     left="25"
      name="fastpay 10"
-     top="78"
+     top_pad="8"
      width="80" />
     <button
-     height="20"
+     height="23"
      label="L$20"
      label_selected="L$20"
      layout="topleft"
      left_pad="15"
      name="fastpay 20"
-     top_delta="0"
-     width="80" />
-    <button
-     enabled="false"
-     height="20"
-     label="Pay"
-     label_selected="Pay"
-     layout="topleft"
-     left="120"
-     name="pay btn"
-     top="112"
-     width="80" />
-    <button
-     height="20"
-     label="Cancel"
-     label_selected="Cancel"
-     layout="topleft"
-     left_pad="3"
-     name="cancel btn"
-     top_delta="0"
      width="80" />
     <text
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
      height="18"
      layout="topleft"
-     left="12"
-     name="payee_label"
-     top="7"
-     width="75">
-        Pay resident:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="18"
-     layout="topleft"
-     left_delta="73"
-     name="payee_name"
-     top_delta="0"
-     width="210">
-        [FIRST] [LAST]
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     halign="right"
-     height="18"
-     layout="topleft"
-     left="5"
-     name="fastpay text"
-     top="54"
-     width="95">
-        Fast Pay:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     font="SansSerif"
-     height="18"
-     layout="topleft"
-     left="12"
+     left="25"
      name="amount text"
-     top="112"
-     width="75">
-        Amount:
+     top_pad="8"
+     width="180">
+        Or, choose amount:
     </text>
     <line_editor
      border_style="line"
-     border_thickness="1"
      follows="left|top|right"
-     font="SansSerif"
-     height="18"
+     height="19"
+     top_pad="0"
      layout="topleft"
-     left_delta="46"
+     left="120"
      max_length="9"
      name="amount"
-     top_delta="0"
-     width="57" />
+     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>