Skip to content
Snippets Groups Projects
Commit 3f469dce authored by Lynx Linden's avatar Lynx Linden
Browse files

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.
parent 95738da3
No related branches found
No related tags found
No related merge requests found
...@@ -444,13 +444,11 @@ void LLFloaterPay::onCacheOwnerName(const LLUUID& owner_id, ...@@ -444,13 +444,11 @@ void LLFloaterPay::onCacheOwnerName(const LLUUID& owner_id,
{ {
if (is_group) if (is_group)
{ {
childSetVisible("payee_group",true); setTitle(getString("payee_group"));
childSetVisible("payee_resident",false);
} }
else else
{ {
childSetVisible("payee_group",false); setTitle(getString("payee_resident"));
childSetVisible("payee_resident",true);
} }
childSetTextArg("payee_name", "[FIRST]", firstname); childSetTextArg("payee_name", "[FIRST]", firstname);
......
...@@ -8,32 +8,14 @@ ...@@ -8,32 +8,14 @@
help_topic="give_money" help_topic="give_money"
save_rect="true" save_rect="true"
width="225"> width="225">
<text <string
type="string" name="payee_group">
length="1" Pay Group
follows="left|top" </string>
font="SansSerifBold" <string
height="18" name="payee_resident">
layout="topleft" Pay Resident
left="12" </string>
name="payee_group"
top="7"
width="75">
Pay group:
</text>
<text
type="string"
length="1"
follows="left|top"
font="SansSerifBold"
height="18"
layout="topleft"
left="12"
name="payee_resident"
top="7"
width="75">
Pay resident:
</text>
<icon <icon
height="16" height="16"
width="16" width="16"
...@@ -41,7 +23,7 @@ ...@@ -41,7 +23,7 @@
mouse_opaque="true" mouse_opaque="true"
name="icon_person" name="icon_person"
tool_tip="Person" tool_tip="Person"
top_pad="0" top_pad="24"
left="10" left="10"
/> />
<text <text
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment