Automated merge with ssh://hg.lindenlab.com/james/gooey

2 files changed, 17 insertions, 16 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
index 1946920a9c..455018f467 100644
--- a/indra/newview/skins/default/xui/en/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
@@ -30,25 +30,25 @@
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
      height="16"
      layout="topleft"
      left_pad="7"
+     top_delta="3"
      name="payee_name"
-     width="210">
-        [FIRST] [LAST]
+     width="184">
+      Ericacita Moostopolison
     </text>
     <text
      type="string"
      length="1"
      follows="left|top"
      halign="left"
-     height="16"
+     height="14"
      layout="topleft"
-     left="30"
+     left="34"
      name="object_name_label"
      top_pad="0"
-     width="150">
+     width="180">
         Via object:
     </text>
    <icon
@@ -59,20 +59,21 @@
      name="icon_object"
      tool_tip="Objects"
      top_pad="0"
-     left="30"
+     left="10"
      />
     <text
      type="string"
      length="1"
      follows="left|top"
-     font="SansSerif"
-     height="18"
+     height="16"
      layout="topleft"
-     left_pad="5"
+     left_pad="7"
      name="object_name_text"
-     top_delta="0"
-     width="210">
-        ...
+     top_delta="3"
+     use_ellipses="true"
+     word_wrap="false"
+     width="188">
+        My awesome object with a really damn long name
     </text>
    <button
      height="23"
@@ -112,7 +113,7 @@
      type="string"
      length="1"
      follows="left|top"
-     height="18"
+     height="14"
      layout="topleft"
      left="25"
      name="amount text"
@@ -123,7 +124,7 @@
     <line_editor
      border_style="line"
      follows="left|top|right"
-     height="19"
+     height="21"
      top_pad="0"
      layout="topleft"
      left="120"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index e55453f772..a1e190fc5e 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2675,7 +2675,7 @@ even though the user gets a free copy.
 			 height="18"
 			 layout="topleft"
 			 left="10"
-       use_ellipsis="true" 
+                         use_ellipses="true"
 			 read_only="true"
 			 name="media_info"
 			 width="180" />