diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-11-05 11:30:28 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-05 11:30:28 +0000 |
| commit | 3f469dcef67a0ee79def5b10990a652a0d75eacf (patch) | |
| tree | c3f1512a738b3787b274ab52219edf3b8c2a123d /indra/newview | |
| parent | 95738da3d82b92e82744dbc6b377a3feae2e6441 (diff) | |
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.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpay.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_pay_object.xml | 36 |
2 files changed, 11 insertions, 31 deletions
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"> - <text - type="string" - length="1" - follows="left|top" - font="SansSerifBold" - height="18" - layout="topleft" - left="12" - 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> + <string + name="payee_group"> + Pay Group + </string> + <string + name="payee_resident"> + Pay Resident + </string> <icon height="16" width="16" @@ -41,7 +23,7 @@ mouse_opaque="true" name="icon_person" tool_tip="Person" - top_pad="0" + top_pad="24" left="10" /> <text |