DN-174Some length of Display Name (username) can cause the name to disappear off of the Buy object floater

3 files changed, 20 insertions, 4 deletions

diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
index f46a2be0fa..ee8487b160 100644
--- a/indra/newview/llfloaterbuy.cpp
+++ b/indra/newview/llfloaterbuy.cpp
@@ -177,7 +177,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
 	object_list->addElement(row);
 
 	floater->getChild<LLUICtrl>("buy_text")->setTextArg("[AMOUNT]", llformat("%d", sale_info.getSalePrice()));
-	floater->getChild<LLUICtrl>("buy_text")->setTextArg("[NAME]", owner_name);
+	floater->getChild<LLUICtrl>("buy_name_text")->setTextArg("[NAME]", owner_name);
 
 	// Must do this after the floater is created, because
 	// sometimes the inventory is already there and 
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index 77a0e9b91b..babbf0f5ca 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
@@ -56,7 +56,7 @@
     <text
      type="string"
      length="1"
-     follows="left|bottom"
+     follows="left|right|bottom"
      font="SansSerif"
      height="16"
      layout="topleft"
@@ -64,6 +64,7 @@
      name="buy_text"
      text_color="white"
      top="220"
+     use_ellipses="true" 
      width="260">
         Buy for L$[AMOUNT] from [NAME]?
     </text>
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index db595458c0..8dfb6ba00c 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -84,7 +84,7 @@
      length="1"
      follows="left|right|bottom"
      font="SansSerif"
-     height="35"
+     height="15"
      layout="topleft"
      left_delta="0"
 	 line_spacing.pixels="7"
@@ -95,8 +95,23 @@
      width="260"
 	 word_wrap="true">
 Buy for L$[AMOUNT] from:
-[NAME]?
     </text>
+  <text
+     type="string"
+     length="1"
+     follows="left|right|bottom"
+     font="SansSerif"
+     height="15"
+     layout="topleft"
+     left_delta="0"
+	 line_spacing.pixels="7"
+     name="buy_name_text"
+     text_color="white"
+     top_pad="5"
+     use_ellipses="true"
+     width="260">
+    [NAME]?
+  </text>
     <button
      follows="right|bottom"
      height="23"