From ced750d70538b846b5943c4ca1541c3fa7d14630 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 9 Jan 2010 15:36:34 -0600
Subject: Improved "Pay Resident" floater layout and XML.

---
 ChangeLog.txt                                      | 22 +++++
 linden/indra/newview/llgivemoney.cpp               | 11 ++-
 .../newview/skins/default/xui/da/floater_pay.xml   | 29 ++++---
 .../newview/skins/default/xui/de/floater_pay.xml   | 29 ++++---
 .../skins/default/xui/en-us/floater_pay.xml        | 96 +++++++++-------------
 .../newview/skins/default/xui/es/floater_pay.xml   | 30 ++++---
 .../newview/skins/default/xui/fr/floater_pay.xml   | 34 ++++----
 .../newview/skins/default/xui/hu/floater_pay.xml   | 29 ++++---
 .../newview/skins/default/xui/it/floater_pay.xml   | 34 ++++----
 .../newview/skins/default/xui/ja/floater_pay.xml   | 24 ++----
 .../newview/skins/default/xui/ko/floater_pay.xml   | 24 ++----
 .../newview/skins/default/xui/pl/floater_pay.xml   | 30 ++++---
 .../newview/skins/default/xui/pt/floater_pay.xml   | 29 ++++---
 .../newview/skins/default/xui/ru/floater_pay.xml   | 29 +++----
 .../newview/skins/default/xui/tr/floater_pay.xml   | 29 ++++---
 .../newview/skins/default/xui/uk/floater_pay.xml   | 30 ++++---
 .../newview/skins/default/xui/zh/floater_pay.xml   | 24 ++----
 17 files changed, 258 insertions(+), 275 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index e2ebc9a..e8459a6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,25 @@
+2010-01-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* Improved "Pay Resident" floater layout and XML.
+
+	  modified:   linden/indra/newview/llgivemoney.cpp
+	  modified:   linden/indra/newview/skins/default/xui/da/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/de/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/es/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/fr/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/hu/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/it/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/ja/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/ko/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/pl/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/pt/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/ru/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/tr/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/uk/floater_pay.xml
+	  modified:   linden/indra/newview/skins/default/xui/zh/floater_pay.xml
+
+
 2010-01-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* Implemented VWR-9597 (optional message when paying someone).
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index ed67c97..849787f 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -147,7 +147,9 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
 	++i;
 
 	
-    childSetVisible("amount text", FALSE);	
+	childSetVisible("amount text", FALSE);	
+	childSetVisible("currency text", FALSE);
+
 
 	std::string last_amount;
 	if(sLastAmount > 0)
@@ -155,7 +157,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
 		last_amount = llformat("%d", sLastAmount);
 	}
 
-    childSetVisible("amount", FALSE);
+	childSetVisible("amount", FALSE);
 	
 	childSetKeystrokeCallback("amount", &LLFloaterPay::onKeystroke, this);
 	childSetText("amount", last_amount);
@@ -207,12 +209,15 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
 			self->childSetVisible("amount", FALSE);
 			self->childSetVisible("pay btn", FALSE);
 			self->childSetVisible("amount text", FALSE);
+			self->childSetVisible("currency text", FALSE);
+
 		}
 		else if (PAY_PRICE_DEFAULT == price)
 		{			
 			self->childSetVisible("amount", TRUE);
 			self->childSetVisible("pay btn", TRUE);
 			self->childSetVisible("amount text", TRUE);
+			self->childSetVisible("currency text", TRUE);
 		}
 		else
 		{
@@ -223,6 +228,7 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
 			self->childSetVisible("pay btn", TRUE);
 			self->childSetEnabled("pay btn", TRUE);
 			self->childSetVisible("amount text", TRUE);
+			self->childSetVisible("currency text", TRUE);
 
 			self->childSetText("amount", llformat("%d", llabs(price)));
 		}
@@ -362,6 +368,7 @@ void LLFloaterPay::payDirectly(money_callback callback,
 	floater->childSetVisible("amount", TRUE);
 	floater->childSetVisible("pay btn", TRUE);
 	floater->childSetVisible("amount text", TRUE);
+	floater->childSetVisible("currency text", TRUE);
 
 	floater->childSetVisible("fastpay text",TRUE);
 	for(S32 i=0;i<MAX_PAY_BUTTONS;++i)
diff --git a/linden/indra/newview/skins/default/xui/da/floater_pay.xml b/linden/indra/newview/skins/default/xui/da/floater_pay.xml
index cca4240..51095e9 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_pay.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<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" />
-	<text type="string" length="1" name="payee_label" left="5" width="81">
-		Betal beboer:
-	</text>
-	<text type="string" length="1" name="payee_name">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text">
+<floater name="Give Money" title="Betal beboer: [FIRST] [LAST]">
+
+	<text name="fastpay text">
 		Hurtig betal:
 	</text>
-	<text type="string" length="1" name="amount text" left="4" >
+
+	<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 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.xml b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
index 5d0dbff..dc38697 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<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="Zahlen" label_selected="Zahlen" name="pay btn" />
-	<button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" />
-	<text type="string" length="1" name="payee_label" width="130">
-		Einwohner bezahlen:
-	</text>
-	<text type="string" length="1" name="payee_name" left="130">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text">
+<floater name="Give Money" title="Einwohner bezahlen: [FIRST] [LAST]">
+
+	<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 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.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
index a8739f4..9caf96e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
@@ -1,90 +1,76 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <floater name="Give Money" title="Pay resident: [FIRST] [LAST]"
-         rect_control="FloaterPayRectB"
-         can_minimize="true" can_resize="false"
          bottom="-197" left="439" height="185" width="300"
-         min_height="100" min_width="100">
+         min_height="100" min_width="100" rect_control="FloaterPayRectB"
+         can_minimize="true" can_resize="false">
 
 
-	<text name="fastpay text" type="string" length="1"
-        bottom="-50" left="15" height="18" width="60" v_pad="0" h_pad="0"
-        bg_visible="false" drop_shadow_visible="true"
-        border_visible="false" border_drop_shadow_visible="false"
-	      follows="left|top" font="SansSerif"  halign="left">
-    Fast Pay:
+	<text name="fastpay text"
+	      bottom="-50" left="15" height="18" width="100"
+	      follows="left|top" font="SansSerif">
+		Fast Pay:
 	</text>
 
 	<button name="fastpay 1" label="L$1"
-          bottom_delta="0" left="85" height="20" width="80"
-          font="SansSerif" halign="center" scale_image="true" />
+	        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="90" height="20" width="80"
-          font="SansSerif" halign="center" scale_image="true" />
+	        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="85" height="20" width="80"
-          font="SansSerif" halign="center" scale_image="true" />
+	        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="90" height="20" width="80"
-          font="SansSerif" halign="center" scale_image="true" />
+	        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" />
+	<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="message text" type="string" length="1"
-        bottom_delta="-32" left="15" height="18" width="60"
-        v_pad="0" h_pad="0" bg_visible="false" drop_shadow_visible="true"
-        border_visible="false" border_drop_shadow_visible="false"
-	      follows="left|top" font="SansSerif"  halign="left">
-    Message:
+	<text name="message text"
+	      bottom_delta="-32" left="15" height="18" width="60"
+	      follows="left|top" font="SansSerif">
+	  Message:
 	</text>
 
 	<line_editor name="message" max_length="140"
-               bottom_delta="1" left_delta="65" height="18" width="205"
-               bevel_style="in" border_style="line" border_thickness="1"
-	             follows="left|top|right" font="SansSerif"
-	             handle_edit_keys_directly="false"
-               select_all_on_focus_received="false" select_on_focus="false" />
-
-
-	<text name="amount text" type="string" length="1"
-        bottom_delta="-28" left="15" height="18" width="60"
-        v_pad="0" h_pad="0" bg_visible="false" drop_shadow_visible="true"
-        border_visible="false" border_drop_shadow_visible="false"
-	      follows="left|top" font="SansSerif"  halign="left">
-    Amount:
+	             bottom_delta="1" left="80" height="18" right="-15"
+	             bevel_style="in" border_style="line" border_thickness="1"
+	             follows="left|top|right" font="SansSerif" />
+
+
+	<text name="amount text"
+	      bottom_delta="-28" left="15" height="18" width="70"
+	      follows="left|top" font="SansSerif">
+	  Amount:
 	</text>
 
-	<text name="L$ text" type="string" length="1"
-        bottom_delta="0" left_delta="62" height="18" width="15"
-        v_pad="0" h_pad="0" bg_visible="false" drop_shadow_visible="true"
-        border_visible="false" border_drop_shadow_visible="false"
-	      follows="left|top" font="SansSerif"  halign="left">
-    L$
+	<text name="currency text"
+	      bottom_delta="0" left_delta="67" height="18" width="15"
+	      follows="left|top" font="SansSerif">
+	  L$
 	</text>
 
 	<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"
-	             handle_edit_keys_directly="false"
-               select_all_on_focus_received="false" select_on_focus="false" />
+	             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="60"
-          font="SansSerif" halign="center" scale_image="true" />
+	        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="80"
-          font="SansSerif" halign="center" scale_image="true" />
-
+	        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.xml b/linden/indra/newview/skins/default/xui/es/floater_pay.xml
index 11c1f23..bf195d9 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_pay.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-	<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"/>
-	<text length="1" name="payee_label" type="string" left="5" width="105">
-		Pagar al residente:
-	</text>
-	<text length="1" name="payee_name" type="string" left="115">
-		[FIRST] [LAST]
-	</text>
-	<text length="1" name="fastpay text" type="string" width="100" halign="left">
+<floater name="Give Money" title="Pagar al residente: [FIRST] [LAST]">
+
+	<text name="fastpay text">
 		Pago rápido:
 	</text>
-	<text length="1" name="amount text" type="string" left="4" >
+
+	<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>
-	<line_editor left="60" name="amount" width="55"/>
+
+	<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.xml b/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
index c5b689e..02cf032 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-	<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="Payer" label_selected="Payer" name="pay btn"/>
-	<button label="Annuler" label_selected="Annuler" name="cancel btn"/>
-	<text length="1" name="payee_label" type="string" left="5">
-		Payer :
+<floater name="Give Money" title="Payer: [FIRST] [LAST]">
+
+	<text name="fastpay text">
+		Paiement rapide:
 	</text>
-	<text length="1" name="payee_name" type="string">
-		[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="fastpay text" type="string" width="100" halign="left">
-		Paiement rapide :
-	</text>
-	<text left="4" length="1" name="amount text" type="string">
-		Montant :
-	</text>
-	<line_editor left="60" name="amount" width="55"/>
+
+	<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.xml b/linden/indra/newview/skins/default/xui/hu/floater_pay.xml
index f2de810c..b01019a 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_pay.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<button label="1 L$" label_selected="1 L$" name="fastpay 1" />
-	<button label="5 L$" label_selected="L$5" name="fastpay 5" />
-	<button label="10 L$" label_selected="10 L$" name="fastpay 10" />
-	<button label="20 L$" label_selected="L$20" name="fastpay 20" />
-	<button label="Fizet" label_selected="Fizet" name="pay btn" />
-	<button label="Mégsem" label_selected="Mégsem" name="cancel btn" />
-	<text type="string" length="1" name="payee_label" width="142" left="5">
-		Fizetés ennek a lakónak:
-	</text>
-	<text type="string" length="1" name="payee_name" left="145">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text">
+<floater name="Give Money" title="Fizetés ennek a lakónak: [FIRST] [LAST]">
+
+	<text name="fastpay text">
 		Gyorsfizetés:
 	</text>
-	<text type="string" length="1" name="amount text" left="4" >
+
+	<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 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.xml b/linden/indra/newview/skins/default/xui/it/floater_pay.xml
index 4889f97..0bd49ee 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_pay.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-	<button label="1 L$" label_selected="1 L$" name="fastpay 1" left="118" width="80" />
-	<button label="5 L$" label_selected="5 L$" name="fastpay 5" left="210"/>
-	<button label="10 L$" label_selected="10 L$" name="fastpay 10" left="118" width="80" />
-	<button label="20 L$" label_selected="20 L$" name="fastpay 20" left="210"/>
-	<button label="Paga" label_selected="Paga" name="pay btn" left="127"/>
-	<button label="Annulla" label_selected="Annulla" name="cancel btn" left="210"/>
-	<text name="payee_label" left="5" width="105">
-		Paga residente:
-	</text>
-	<text name="payee_name" left="115">
-		[FIRST] [LAST]
-	</text>
-	<text name="fastpay text" width="110" halign="left">
+<floater name="Give Money" title="Paga residente: [FIRST] [LAST]">
+
+	<text name="fastpay text" left="10" width="120">
 		Pagamento veloce:
 	</text>
-	<text name="amount text" left="4" >
+
+	<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>
-	<line_editor left="70" name="amount" width="49"/>
+
+	<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.xml b/linden/indra/newview/skins/default/xui/ja/floater_pay.xml
index 114cb90..93d3c21 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_pay.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<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" />
-	<text type="string" length="1" name="payee_label">
-		支払い先：
-	</text>
-	<text type="string" length="1" name="payee_name">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text">
+<floater name="Give Money" title="支払い先： [FIRST] [LAST]">
+
+	<text name="fastpay text">
 		一括払い：
 	</text>
-	<text type="string" length="1" name="amount text">
+
+	<text name="amount text">
 		金額：
 	</text>
+
+	<button label="支払い"   name="pay btn"    />
+	<button label="取り消し" name="cancel btn" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_pay.xml b/linden/indra/newview/skins/default/xui/ko/floater_pay.xml
index a76640b..b53b681 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_pay.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<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" />
-	<text type="string" length="1" name="payee_label">
-		주민 지불:
-	</text>
-	<text type="string" length="1" name="payee_name">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text">
+<floater name="Give Money" title="주민 지불: [FIRST] [LAST]">
+
+	<text name="fastpay text">
 		빠른 지불:
 	</text>
-	<text type="string" length="1" name="amount text">
+
+	<text name="amount text">
 		금액:
 	</text>
+
+	<button name="pay btn"    label="지불" />
+	<button name="cancel btn" label="취소" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_pay.xml b/linden/indra/newview/skins/default/xui/pl/floater_pay.xml
index 7035890..0a0a445 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_pay.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<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="Zapłać" label_selected="Zapłać" name="pay btn" />
-	<button label="Anuluj" label_selected="Anuluj" name="cancel btn" />
-	<text type="string" length="1" name="payee_label">
-		Zapłata dla:
-	</text>
-	<text type="string" length="1" name="payee_name">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text" halign="left" left="12">
+<floater name="Give Money" title="Zapłata dla: [FIRST] [LAST]">
+
+	<text name="fastpay text">
 		Szybka Zapłata:
 	</text>
-	<text type="string" length="1" name="amount text">
+
+	<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>
-	<line_editor left="52" name="amount" />
+
+	<button name="pay btn"    label="Zapłać" />
+	<button name="cancel btn" label="Anuluj" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_pay.xml b/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
index 1bd4c55..588eeaa 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<button label="L$1" label_selected="L$1" name="fastpay 1" left="112" />
-	<button label="L$5" label_selected="L$5" name="fastpay 5" />
-	<button label="L$10" label_selected="L$10" name="fastpay 10" left="112" />
-	<button label="L$20" label_selected="L$20" name="fastpay 20" />
-	<button label="Pagar" label_selected="Pagar" name="pay btn" />
-	<button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
-	<text type="string" length="1" name="payee_label" width="110" left="5">
-		Pagar residente:
-	</text>
-	<text type="string" length="1" name="payee_name" left="115">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text" width="120" halign="left">
+<floater name="Give Money" title="Pagar residente: [FIRST] [LAST]">
+
+	<text name="fastpay text" left="10" width="120">
 		Pagamento rápido:
 	</text>
-	<text type="string" length="1" name="amount text" left="4" >
+
+	<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 name="pay btn"    label="Pagar"    />
+	<button name="cancel btn" label="Cancelar" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_pay.xml b/linden/indra/newview/skins/default/xui/ru/floater_pay.xml
index ba72d42..259d366 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_pay.xml
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<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" />
-	<text type="string" length="1" name="payee_label" left="5" width="135">
-		Заплатить резиденту:
-	</text>
-	<text type="string" length="1" name="payee_name" left="145">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text" width="100" halign="left">
+<floater name="Give Money" title="Заплатить резиденту: [FIRST] [LAST]">
+
+	<text name="fastpay text">
 		Быстрая оплата:
 	</text>
-	<text type="string" length="1" name="amount text" left="4" >
+
+	<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>
-	<line_editor left="60" name="amount" width="55"/>
+
+	<button name="pay btn"    label="Платить" />
+	<button name="cancel btn" label="Отмена"  />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/tr/floater_pay.xml b/linden/indra/newview/skins/default/xui/tr/floater_pay.xml
index f40322a..2bb51e2 100644
--- a/linden/indra/newview/skins/default/xui/tr/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/tr/floater_pay.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<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" />
-	<text type="string" length="1" name="payee_label">
-		Üyeye öde:
-	</text>
-	<text type="string" length="1" name="payee_name">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text">
+<floater name="Give Money" title="Üyeye öde: [FIRST] [LAST]">
+
+	<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 name="pay btn"    label="Öde"   />
+	<button name="cancel btn" label="İptal" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_pay.xml b/linden/indra/newview/skins/default/xui/uk/floater_pay.xml
index f37080b..30490c0 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_pay.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<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" />
-	<text type="string" length="1" name="payee_label" left="5" width="135">
-		Заплатити резиденту:
-	</text>
-	<text type="string" length="1" name="payee_name" left="145">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text" width="100" halign="left">
+<floater name="Give Money" title="Заплатити резиденту: [FIRST] [LAST]">
+
+	<text name="fastpay text">
 		Швидка оплата:
 	</text>
-	<text type="string" length="1" name="amount text" left="4" >
+
+	<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>
-	<line_editor left="45" name="amount" width="55"/>
+
+	<button name="pay btn"    label="Платити" />
+	<button name="cancel btn" label="Отмена"  />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
index 2691383..ac30075 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
-	<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" />
-	<text type="string" length="1" name="payee_label">
-		支付给居民:
-	</text>
-	<text type="string" length="1" name="payee_name">
-		[FIRST] [LAST]
-	</text>
-	<text type="string" length="1" name="fastpay text">
+<floater name="Give Money" title="支付给居民: [FIRST] [LAST]">
+
+	<text name="fastpay text">
 		快速支付:
 	</text>
-	<text type="string" length="1" name="amount text">
+
+	<text name="amount text">
 		数量:
 	</text>
+
+	<button name="pay btn"    label="支付" />
+	<button name="cancel btn" label="取消" />
+
 </floater>
-- 
cgit v1.1