Merged in 'paymessage' branch.

Custom message in Pay Resident floater, and XUI cleanup.
(SNOW-436, formerly VWR-9597)

2 files changed, 36 insertions, 36 deletions

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/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>