From 3f469dcef67a0ee79def5b10990a652a0d75eacf Mon Sep 17 00:00:00 2001 From: Lynx Linden Date: Thu, 5 Nov 2009 11:30:28 +0000 Subject: DEV-38840: cosmetic fix to the Pay Resident/Group floater in 2.0. Previously the title for this floater was set to "" and a text string was positioned over the title bar based upon whether you are paying a resident or a group. This could mess up the position of the floater "title" and was also truncating the "Pay Resident" title. Now, we use setTitle() to actually set the floater title appropriately. --- indra/newview/llfloaterpay.cpp | 6 ++-- .../skins/default/xui/en/floater_pay_object.xml | 36 ++++++---------------- 2 files changed, 11 insertions(+), 31 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp index 88811d06fe..c2389e73a0 100644 --- a/indra/newview/llfloaterpay.cpp +++ b/indra/newview/llfloaterpay.cpp @@ -444,13 +444,11 @@ void LLFloaterPay::onCacheOwnerName(const LLUUID& owner_id, { if (is_group) { - childSetVisible("payee_group",true); - childSetVisible("payee_resident",false); + setTitle(getString("payee_group")); } else { - childSetVisible("payee_group",false); - childSetVisible("payee_resident",true); + setTitle(getString("payee_resident")); } childSetTextArg("payee_name", "[FIRST]", firstname); 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 8d230023cc..1946920a9c 100644 --- a/indra/newview/skins/default/xui/en/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml @@ -8,32 +8,14 @@ help_topic="give_money" save_rect="true" width="225"> - - Pay group: - - - Pay resident: - + + Pay Group + + + Pay Resident +