Merged in 'paymessage' branch.

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

2 files changed, 37 insertions, 39 deletions

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