17 files changed, 404 insertions, 379 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index e8459a6..65c892d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,25 @@
+2010-01-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Improved "Pay Object" floater layout and XML.
+
+          modified:   linden/indra/newview/llgivemoney.cpp
+          modified:   linden/indra/newview/skins/default/xui/da/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/it/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/pl/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml
+          modified:   linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+
+
 2010-01-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * Improved "Pay Resident" floater layout and XML.
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index 849787f..423357d 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -353,7 +353,7 @@ void LLFloaterPay::payViaObject(money_callback callback, const LLUUID& object_id
         BOOL is_group = FALSE;
         node->mPermissions->getOwnership(owner_id, is_group);
         
-        floater->childSetText("object_name_text",node->mName);
+        floater->childSetTextArg("via object", "[OBJECT]", node->mName);
 
         floater->finishPayUI(owner_id, is_group);
 }
@@ -404,13 +404,11 @@ void LLFloaterPay::onCacheOwnerName(const LLUUID& owner_id,
         
         if (is_group)
         {
-                self->childSetVisible("payee_group",true);
-                self->childSetVisible("payee_resident",false);
+                self->setTitleArg("[PAY TYPE]", self->getString("pay group") );
         }
         else
         {
-                self->childSetVisible("payee_group",false);
-                self->childSetVisible("payee_resident",true);
+                self->setTitleArg("[PAY TYPE]", self->getString("pay resident") );
         }
         
         self->childSetTextArg("payee_name", "[FIRST]", firstname);
diff --git a/linden/indra/newview/skins/default/xui/da/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/da/floater_pay_object.xml
index 465f7e8..318f96d 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_pay_object.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group">
+<floater name="Give Money">
+
+        <string name="pay group">
                 Betal gruppe:
-        </text>
-        <text type="string" length="1" name="payee_resident">
+        </string>
+        <string name="pay resident">
                 Betal beboer:
+        </string>
+
+        <text name="via object">
+                Via objekt: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label">
-                Via objekt:
-        </text>
-        <text type="string" length="1" name="object_name_text">
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text">
+
+        <text name="fastpay text">
                 Hurtig betal:
         </text>
-        <text type="string" length="1" name="amount text">
+
+        <button name="fastpay 1"  label="L$1"  />
+        <button name="fastpay 5"  label="L$5"  />
+        <button name="fastpay 10" label="L$10" />
+        <button name="fastpay 20" label="L$20" />
+
+        <text name="amount text">
                 Beløb:
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" />
-        <button label="L$5" label_selected="L$5" name="fastpay 5" />
-        <button label="L$10" label_selected="L$10" name="fastpay 10" />
-        <button label="L$20" label_selected="L$20" name="fastpay 20" />
-        <button label="Betal" label_selected="Betal" name="pay btn" />
-        <button label="Annullér" label_selected="Annullér" name="cancel btn" />
+
+        <button name="pay btn"    label="Betal"    />
+        <button name="cancel btn" label="Annullér" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
index eaf95a9..55ad735 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group" width="105">
+<floater name="Give Money">
+
+        <string name="pay group">
                 Gruppe bezahlen:
-        </text>
-        <text type="string" length="1" name="payee_resident" width="118">
+        </string>
+        <string name="pay resident">
                 Einwohner bezahlen:
+        </string>
+
+        <text name="via object">
+                Über Objekt: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name" left="128" width="168">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label" halign="left">
-                Über Objekt:
-        </text>
-        <text type="string" length="1" name="object_name_text" left="105">
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text" width="95" halign="left">
+
+        <text name="fastpay text">
                 Schnellzahlung:
         </text>
-        <text type="string" length="1" name="amount text">
+
+        <button name="fastpay 1"  label="1 L$"  left="115" />
+        <button name="fastpay 5"  label="5 L$"             />
+        <button name="fastpay 10" label="10 L$" left="115" />
+        <button name="fastpay 20" label="20 L$"            />
+
+        <text name="amount text">
                 Betrag:
         </text>
-        <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
-        <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190" />
-        <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
-        <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190" />
-        <button label="Zahlen" label_selected="Zahlen" name="pay btn" />
-        <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" width="76" />
+
+        <button name="pay btn"    label="Zahlen"    />
+        <button name="cancel btn" label="Abbrechen" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
index 03e009d..e66d8d5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
@@ -1,72 +1,80 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-521" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" enabled="true" height="140" left="690" min_height="100"
-     min_width="100" mouse_opaque="true" name="Give Money"
-     rect_control="FloaterPayRectB" title="" width="300">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="right" height="18" left="5"
-             mouse_opaque="true" name="payee_group" v_pad="0" width="75">
-                Pay group:
+
+<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST]"
+         rect_control="FloaterPayRectB"
+         can_minimize="true" can_resize="false"
+         bottom="-197" left="439" height="170" width="300">
+
+
+        <string name="pay group">
+                Pay Group:
+        </string>
+        <string name="pay resident">
+                Pay Resident:
+        </string>
+
+
+        <text name="via object" type="string"
+              bottom="-45" left="15" height="18" width="250"
+              follows="left|top" font="SansSerif"  halign="left">
+                Via object: [OBJECT]
         </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="0" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerif" h_pad="0" halign="right" height="18"
-             left="5" mouse_opaque="true" name="payee_resident" v_pad="0" width="75">
-                Pay resident:
+
+
+        <text name="fastpay text" type="string" length="1"
+              bottom_delat="-25" left="15" height="18" width="100"
+              follows="left|top" font="SansSerif"  halign="left">
+          Fast Pay:
         </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="left" height="18" left="85"
-             mouse_opaque="true" name="payee_name" v_pad="0" width="210">
-                [FIRST] [LAST]
+
+        <button name="fastpay 1" label="L$1"
+                bottom_delta="0" left="95" height="20" width="75"
+                font="SansSerif" halign="center" scale_image="true" />
+
+        <button name="fastpay 5" label="L$5"
+                bottom_delta="0" left_delta="85" height="20" width="75"
+                font="SansSerif" halign="center" scale_image="true" />
+
+        <button name="fastpay 10" label="L$10"
+                bottom_delta="-25" left="95" height="20" width="75"
+                font="SansSerif" halign="center" scale_image="true" />
+
+        <button name="fastpay 20" label="L$20"
+                bottom_delta="0" left_delta="85" height="20" width="75"
+                font="SansSerif" halign="center" scale_image="true" />
+
+
+        <view_border name="separator left"
+                     bottom_delta="-12" left="8" height="1" width="282"
+                     bevel_style="in" border_thickness="1" follows="top|left" />
+
+
+        <text name="amount text" type="string" length="1"
+              bottom_delta="-28" left="15" height="18" width="70"
+              follows="left|top" font="SansSerif"  halign="left">
+          Amount:
         </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="right" height="18" left="5"
-             mouse_opaque="true" name="object_name_label" v_pad="0" width="75">
-                Via object:
+
+        <text name="currency text" type="string" length="1"
+              bottom_delta="0" left_delta="62" height="18" width="15"
+              follows="left|top" font="SansSerif"  halign="left">
+                L$
         </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="left" height="18" left="85"
-             mouse_opaque="true" name="object_name_text" v_pad="0" width="210">
-                ...
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-72" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="right" height="18" left="5"
-             mouse_opaque="true" name="fastpay text" v_pad="0" width="75">
-                Fast Pay:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="right" height="18" left="5"
-             mouse_opaque="true" name="amount text" v_pad="0" width="75">
-                Amount:
-        </text>
-        <button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20"
-             label="L$1" label_selected="L$1" left="85" mouse_opaque="true"
-             name="fastpay 1" scale_image="true" width="80" />
-        <button bottom="-74" enabled="true" font="SansSerif" halign="center" height="20"
-             label="L$5" label_selected="L$5" left="170" mouse_opaque="true"
-             name="fastpay 5" scale_image="true" width="80" />
-        <button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20"
-             label="L$10" label_selected="L$10" left="85" mouse_opaque="true"
-             name="fastpay 10" scale_image="true" width="80" />
-        <button bottom="-98" enabled="true" font="SansSerif" halign="center" height="20"
-             label="L$20" label_selected="L$20" left="170" mouse_opaque="true"
-             name="fastpay 20" scale_image="true" width="80" />
-        <button bottom="-132" enabled="false" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Pay" label_selected="Pay" left="140"
-             mouse_opaque="true" name="pay btn" scale_image="true" width="70" />
-        <button bottom="-132" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Cancel" label_selected="Cancel"
-             left="215" mouse_opaque="true" name="cancel btn" scale_image="true"
-             width="70" />
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-130"
-             enabled="true" follows="left|top|right" font="SansSerif"
-             handle_edit_keys_directly="false" height="18" left="85" max_length="9"
-             mouse_opaque="true" name="amount" select_all_on_focus_received="false"
-             select_on_focus="false" width="50" />
+
+        <line_editor name="amount" max_length="9"
+                     bottom_delta="1" left_delta="18" height="18" width="70"
+                     bevel_style="in" border_style="line" border_thickness="1"
+                     follows="left|top|right" font="SansSerif" />
+
+        <button name="pay btn" label="Pay"
+                bottom_delta="-2" left_delta="80" height="20" width="75"
+                font="SansSerif" halign="center" scale_image="true" />
+
+
+        <button name="cancel btn" label="Cancel"
+                bottom="5" right="-5" height="20" width="85"
+                font="SansSerif" halign="center" scale_image="true" />
+
+
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
index 4caee3d..5baf0ad 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_pay_object.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<floater name="Give Money" title="">

-        <text length="1" name="payee_group" type="string" left="5" width="110">

+<floater name="Give Money">

+

+        <string name="pay group">

                 Pagar al grupo:

-        </text>

-        <text length="1" name="payee_resident" type="string" left="5" width="110">

+        </string>

+        <string name="pay resident">

                 Pagar al residente:

+        </string>

+

+        <text name="via object">

+                A través del objeto: [OBJECT]

         </text>

-        <text length="1" name="payee_name" type="string" left="120" width="180">

-                [FIRST] [LAST]

-        </text>

-        <text length="1" name="object_name_label" type="string" left="5" width="110">

-                A través del objeto:

-        </text>

-        <text length="1" name="object_name_text" type="string" left="120" width="180">

-                ...

-        </text>

-        <text length="1" name="fastpay text" type="string">

+

+        <text name="fastpay text">

                 Pago rápido:

         </text>

-        <text length="1" name="amount text" type="string">

+

+        <button name="fastpay 1"  label="1 L$"  />

+        <button name="fastpay 5"  label="5 L$"  />

+        <button name="fastpay 10" label="10 L$" />

+        <button name="fastpay 20" label="20 L$" />

+

+        <text name="amount text">

                 Cantidad:

         </text>

-        <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>

-        <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>

-        <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>

-        <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>

-        <button label="Pagar" label_selected="Pagar" name="pay btn"/>

-        <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>

+

+        <button name="pay btn"    label="Pagar"    />

+        <button name="cancel btn" label="Cancelar" />

+

 </floater>

diff --git a/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index 3dc0af7..57e71e5 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-        <text length="1" name="payee_group" type="string" width="95">
-                Payer le groupe :
+<floater name="Give Money" >
+
+        <string name="pay group">
+                Payer le groupe:
+        </string>
+        <string name="pay resident">
+                Payer le résident:
+        </string>
+
+        <text name="via object">
+                Via un objet: [OBJECT]
         </text>
-        <text length="1" name="payee_resident" type="string" width="100" halign="left" >
-                Payer le résident :
+
+        <text name="fastpay text">
+                Paiement rapide:
         </text>
-        <text length="1" name="payee_name" type="string" left="105">
-                [FIRST] [LAST]
+
+        <button name="fastpay 1"  label="1 L$"  left="120" />
+        <button name="fastpay 5"  label="5 L$"             />
+        <button name="fastpay 10" label="10 L$" left="120" />
+        <button name="fastpay 20" label="20 L$"            />
+
+        <text name="amount text">
+                Montant:
         </text>
-        <text length="1" name="object_name_label" type="string" left="25">
-                Via un objet :
-        </text>
-        <text length="1" name="object_name_text" type="string" left="105">
-                ...
-        </text>
-        <text length="1" name="fastpay text" type="string" width="95">
-                Paiement rapide :
-        </text>
-        <text length="1" name="amount text" type="string" left="5" halign="left">
-                Montant :
-        </text>
-        <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
-        <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190"/>
-        <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
-        <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190"/>
-        <button label="Payer" label_selected="Payer" name="pay btn"/>
-        <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
-        <line_editor left="65" name="amount" width="50" />
+
+        <button name="pay btn"    label="Payer"   />
+        <button name="cancel btn" label="Annuler" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml
index 36c5c65..27e0de6 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_pay_object.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group" left="5" width="110">
+<floater name="Give Money">
+
+        <string name="pay group">
                 Fizetés csoportnak:
-        </text>
-        <text type="string" length="1" name="payee_resident" left="5" width="110">
+        </string>
+        <string name="pay resident">
                 Fizetés lakónak:
+        </string>
+
+        <text name="via object">
+                Tárgy által: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name" left="120" width="180">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label">
-                Tárgy által:
-        </text>
-        <text type="string" length="1" name="object_name_text">
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text">
+
+        <text name="fastpay text">
                 Gyorsfizetés:
         </text>
-        <text type="string" length="1" name="amount text">
+
+        <button name="fastpay 1"  label="1 L$"  left="105" />
+        <button name="fastpay 5"  label="5 L$"             />
+        <button name="fastpay 10" label="10 L$" left="105" />
+        <button name="fastpay 20" label="20 L$"            />
+
+        <text name="amount text">
                 Összeg:
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" />
-        <button label="5 L$" label_selected="5 L$" name="fastpay 5" />
-        <button label="10 L$" label_selected="10 L$" name="fastpay 10" />
-        <button label="L$20" label_selected="L$20" name="fastpay 20" />
-        <button label="Fizet" label_selected="Fizet" name="pay btn" />
-        <button label="Töröl" label_selected="Töröl" name="cancel btn" />
+
+        <button name="pay btn"    label="Fizet"  />
+        <button name="cancel btn" label="Mégsem" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/it/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/it/floater_pay_object.xml
index c41c0ba..59fdf02 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_pay_object.xml
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-        <text name="payee_group" width="100" halign="left">
+<floater name="Give Money">
+
+        <string name="pay group">
                 Paga il gruppo:
-        </text>
-        <text name="payee_resident" width="120" halign="left">
+        </string>
+        <string name="pay resident">
                 Paga il residente:
+        </string>
+
+        <text name="via object" left="10">
+                Mediante l&apos;oggetto: [OBJECT]
         </text>
-        <text name="payee_name" left="120">
-                [FIRST] [LAST]
-        </text>
-        <text name="object_name_label" left="5" width="110" halign="left">
-                Mediante l&apos;oggetto:
-        </text>
-        <text name="object_name_text" left="120" >
-                ...
+
+        <text name="fastpay text" left="10" width="120">
+                Pagamento veloce:
         </text>
-        <text name="fastpay text" width="115" halign="left">
-                Pagamento diretto:
-        </text>
-        <text name="amount text" left="5" halign="left">
+
+        <button name="fastpay 1"  label="1 L$"  left="130"      />
+        <button name="fastpay 5"  label="5 L$"  left_delta="80" />
+        <button name="fastpay 10" label="10 L$" left="130"      />
+        <button name="fastpay 20" label="20 L$" left_delta="80" />
+
+        <text name="amount text" left="10">
                 Ammontare:
         </text>
-        <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="125" width="70"/>
-        <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="200" width="70"/>
-        <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="125" width="70"/>
-        <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="200" width="70"/>
-        <button label="Paga" label_selected="Paga" name="pay btn"/>
-        <button label="Cancella" label_selected="Cancella" name="cancel btn"/>
-        <line_editor left="74" name="amount" width="50" />
+
+        <text name="L$ text" left_delta="82">
+                L$
+        </text>
+
+        <button name="pay btn"    label="Paga"    />
+        <button name="cancel btn" label="Annulla" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index 6ad9c7c..263f7b9 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_pay_object.xml
@@ -1,30 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group">
+<floater name="Give Money">
+
+        <string name="pay group">
                 グループへの支払い：
-        </text>
-        <text type="string" length="1" name="payee_resident">
+        </string>
+        <string name="pay resident">
                 住人への支払い：
+        </string>
+
+        <text name="via object">
+                オブジェクトを介して： [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label">
-                オブジェクトを介して：
-        </text>
-        <text type="string" length="1" name="object_name_text">
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text">
+
+        <text name="fastpay text">
                 一括払い：
         </text>
-        <text type="string" length="1" name="amount text">
+
+        <text name="amount text">
                 金額：
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" />
-        <button label="L$5" label_selected="L$5" name="fastpay 5" />
-        <button label="L$10" label_selected="L$10" name="fastpay 10" />
-        <button label="L$20" label_selected="L$20" name="fastpay 20" />
-        <button label="支払い" label_selected="支払い" name="pay btn" />
-        <button label="取り消し" label_selected="取り消し" name="cancel btn" />
+
+        <button label="支払い"   name="pay btn"    />
+        <button label="取り消し" name="cancel btn" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml
index 8fa6dff..f57a620 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_pay_object.xml
@@ -1,30 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group">
+<floater name="Give Money">
+
+        <string name="pay group">
                 그룹 지불:
-        </text>
-        <text type="string" length="1" name="payee_resident">
+        </string>
+        <string name="pay resident">
                 주민 지불:
+        </string>
+
+        <text name="via object">
+                매개 오브젝트: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label">
-                매개 오브젝트:
-        </text>
-        <text type="string" length="1" name="object_name_text">
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text">
+
+        <text name="fastpay text">
                 빠른 지불:
         </text>
-        <text type="string" length="1" name="amount text">
+
+        <text name="amount text">
                 금액:
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" />
-        <button label="L$5" label_selected="L$5" name="fastpay 5" />
-        <button label="L$10" label_selected="L$10" name="fastpay 10" />
-        <button label="L$20" label_selected="L$20" name="fastpay 20" />
-        <button label="지불" label_selected="지불" name="pay btn" />
-        <button label="취소" label_selected="취소" name="cancel btn" />
+
+        <button name="pay btn"    label="지불" />
+        <button name="cancel btn" label="취소" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/pl/floater_pay_object.xml
index 97c87d5..9d70e4a 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_pay_object.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group" width="100" halign="left">
+<floater name="Give Money">
+
+        <string name="pay group">
                 Zapłać Grupie:
-        </text>
-        <text type="string" length="1" name="payee_resident" width="120" halign="left" >
+        </string>
+        <string name="pay resident">
                 Zapłać Rezydentowi:
+        </string>
+
+        <text name="via object">
+                Poprzez Obiekt: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name" left="125">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label" left="5"  width="95" halign="left">
-                Poprzez Obiekt:
-        </text>
-        <text type="string" length="1" name="object_name_text" left="105" >
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text" width="95" halign="left">
+
+        <text name="fastpay text">
                 Szybka Zapłata:
         </text>
-        <text type="string" length="1" name="amount text" left="5" halign="left">
+
+        <button name="fastpay 1"  label="L$1"  left="115" />
+        <button name="fastpay 5"  label="L$5"             />
+        <button name="fastpay 10" label="L$10" left="115" />
+        <button name="fastpay 20" label="L$20"            />
+
+        <text name="amount text">
                 Suma:
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" left="105"/>
-        <button label="L$5" label_selected="L$5" name="fastpay 5" left="190"/>
-        <button label="L$10" label_selected="L$10" name="fastpay 10" left="105"/>
-        <button label="L$20" label_selected="L$20" name="fastpay 20" left="190"/>
-        <button label="Zapłać" label_selected="Zapłać" name="pay btn" />
-        <button label="Anuluj" label_selected="Anuluj" name="cancel btn" />
-        <line_editor left="50" name="amount" width="50" />
+
+        <button label="Zapłać" name="pay btn"    />
+        <button label="Anuluj" name="cancel btn" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
index ad76cf8..b5a93f4 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group" width="100" halign="left">
+<floater name="Give Money">
+
+        <string name="pay group">
                 Pagar Grupo:
-        </text>
-        <text type="string" length="1" name="payee_resident" width="120" halign="left" >
+        </string>
+        <string name="pay resident">
                 Pagar residente:
+        </string>
+
+        <text name="via object">
+                Via objeto: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name" left="105">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label" left="5" width="95" halign="left">
-                Via objeto:
-        </text>
-        <text type="string" length="1" name="object_name_text" left="105" >
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text" width="115" halign="left">
-                Pagamento Rápido:
+
+        <text name="fastpay text" left="10" width="120">
+                Pagamento rápido:
         </text>
-        <text type="string" length="1" name="amount text" left="5" halign="left">
+
+        <button name="fastpay 1"  label="L$1"  left="125"      />
+        <button name="fastpay 5"  label="L$5"  left_delta="80" />
+        <button name="fastpay 10" label="L$10" left="125"      />
+        <button name="fastpay 20" label="L$20" left_delta="80" />
+
+        <text name="amount text">
                 Quantia:
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70"/>
-        <button label="L$5" label_selected="L$5" name="fastpay 5"  left="200" width="70"/>
-        <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70"/>
-        <button label="L$20" label_selected="L$20" name="fastpay 20"  left="200" width="70"/>
-        <button label="Pagar" label_selected="Pagar" name="pay btn" />
-        <button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
-        <line_editor left="60" name="amount" width="50" />
+
+        <button name="pay btn"    label="Pagar"    />
+        <button name="cancel btn" label="Cancelar" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml
index 8c1b192..3e405a7 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_pay_object.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group" width="100" halign="left">
+<floater name="Give Money">
+
+        <string name="pay group">
                 Платить группе:
-        </text>
-        <text type="string" length="1" name="payee_resident" width="125" halign="left">
+        </string>
+        <string name="pay resident">
                 Платить резиденту:
+        </string>
+
+        <text name="via object">
+                Через объект: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name" left="128">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label" left="5" width="110" halign="left">
-                Через объект:
-        </text>
-        <text type="string" length="1" name="object_name_text" left="128" >
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text" width="115" halign="left">
+
+        <text name="fastpay text">
                 Быстрая оплата:
         </text>
-        <text type="string" length="1" name="amount text" left="5" halign="left" width="85">
-                Количество:
+
+        <button name="fastpay 1"  label="L$1"  left="122" />
+        <button name="fastpay 5"  label="L$5"             />
+        <button name="fastpay 10" label="L$10" left="122" />
+        <button name="fastpay 20" label="L$20"            />
+
+        <text name="amount text">
+                Сумма:
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70" />
-        <button label="L$5" label_selected="L$5" name="fastpay 5" left="200" width="70" />
-        <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70" />
-        <button label="L$20" label_selected="L$20" name="fastpay 20" left="200" width="70" />
-        <button label="Платить" label_selected="Платить" name="pay btn" />
-        <button label="Отмена" label_selected="Отмена" name="cancel btn" />
-        <line_editor left="84" name="amount" width="50" />
+
+        <button name="pay btn"    label="Платить" />
+        <button name="cancel btn" label="Отмена"  />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml
index 4376390..947ffdf 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_pay_object.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group">
+<floater name="Give Money">
+
+        <string name="pay group">
                 Gruba öde:
-        </text>
-        <text type="string" length="1" name="payee_resident">
+        </string>
+        <string name="pay resident">
                 Üyeye öde:
+        </string>
+
+        <text name="via object">
+                Obje ile: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label">
-                Obje ile:
-        </text>
-        <text type="string" length="1" name="object_name_text">
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text">
+
+        <text name="fastpay text">
                 Hızlı öde:
         </text>
-        <text type="string" length="1" name="amount text">
+
+        <button name="fastpay 1"  label="1 L$"  />
+        <button name="fastpay 5"  label="5 L$"  />
+        <button name="fastpay 10" label="10 L$" />
+        <button name="fastpay 20" label="20 L$" />
+
+        <text name="amount text">
                 Miktar:
         </text>
-        <button label="1 L$" label_selected="1 L$" name="fastpay 1" />
-        <button label="5 L$" label_selected="5 L$" name="fastpay 5" />
-        <button label="10 L$" label_selected="10 L$" name="fastpay 10" />
-        <button label="20 L$" label_selected="20 L$" name="fastpay 20" />
-        <button label="Öde" label_selected="Öde" name="pay btn" />
-        <button label="İptal" label_selected="İptal" name="cancel btn" />
+
+        <button name="pay btn"    label="Öde"   />
+        <button name="cancel btn" label="İptal" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml
index b4ded51..80a90e7 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_pay_object.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group" width="100" halign="left">
+<floater name="Give Money">
+
+        <string name="pay group">
                 Платити групі:
-        </text>
-        <text type="string" length="1" name="payee_resident" width="125" halign="left">
+        </string>
+        <string name="pay resident">
                 Платити резиденту:
+        </string>
+
+        <text name="via object">
+                Через об&apos;єкт: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name" left="128">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label" left="5" width="110" halign="left">
-                Через об&apos;єкт:
-        </text>
-        <text type="string" length="1" name="object_name_text" left="128" >
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text" width="115" halign="left">
+
+        <text name="fastpay text">
                 Швидка оплата:
         </text>
-        <text type="string" length="1" name="amount text" left="5" halign="left">
-                Кількість:
+
+        <button name="fastpay 1"  label="L$1"  left="115" />
+        <button name="fastpay 5"  label="L$5"             />
+        <button name="fastpay 10" label="L$10" left="115" />
+        <button name="fastpay 20" label="L$20"            />
+
+        <text name="amount text">
+                Сума:
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70" />
-        <button label="L$5" label_selected="L$5" name="fastpay 5" left="200" width="70" />
-        <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70" />
-        <button label="L$20" label_selected="L$20" name="fastpay 20" left="200" width="70" />
-        <button label="Платити" label_selected="Платити" name="pay btn" />
-        <button label="Відміна" label_selected="Відміна" name="cancel btn" />
-        <line_editor left="70" name="amount" width="50" />
+
+        <button name="pay btn"    label="Платити" />
+        <button name="cancel btn" label="Отмена"  />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index ec56c65..088eeb2 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -1,30 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group">
+<floater name="Give Money">
+
+        <string name="pay group">
                 支付给社团:
-        </text>
-        <text type="string" length="1" name="payee_resident">
+        </string>
+        <string name="pay resident">
                 支付给居民:
+        </string>
+
+        <text name="via object">
+                通过物体: [OBJECT]
         </text>
-        <text type="string" length="1" name="payee_name">
-                [FIRST] [LAST]
-        </text>
-        <text type="string" length="1" name="object_name_label">
-                通过物体:
-        </text>
-        <text type="string" length="1" name="object_name_text">
-                ...
-        </text>
-        <text type="string" length="1" name="fastpay text">
+
+        <text name="fastpay text">
                 快速支付:
         </text>
-        <text type="string" length="1" name="amount text">
+
+        <text name="amount text">
                 数量:
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" />
-        <button label="L$5" label_selected="L$5" name="fastpay 5" />
-        <button label="L$10" label_selected="L$10" name="fastpay 10" />
-        <button label="L$20" label_selected="L$20" name="fastpay 20" />
-        <button label="支付" label_selected="支付" name="pay btn" />
-        <button label="取消" label_selected="取消" name="cancel btn" />
+
+        <button name="pay btn"    label="支付" />
+        <button name="cancel btn" label="取消" />
+
 </floater>