diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-09-21 14:32:36 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-09-21 14:32:36 +0300 |
| commit | c84fe50f18d39adf1bb712927a71628d343781d0 (patch) | |
| tree | 43fac1bbd9043fc169cdeeb2c36b2999d110cac1 /indra | |
| parent | ca4160639866d37802f6d4f77821521cc9f3ed7f (diff) | |
MAINT-5425 FIXED No icon is shown for certain transaction notifications.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnotificationlistitem.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp index 62b3ee3093..8005fa6239 100644 --- a/indra/newview/llnotificationlistitem.cpp +++ b/indra/newview/llnotificationlistitem.cpp @@ -578,6 +578,14 @@ BOOL LLTransactionNotificationListItem::postBuild() mAvatarIcon->setValue("System_Notification"); mAvatarIconExp->setValue("System_Notification"); + mAvatarIcon->setVisible(TRUE); + mAvatarIconExp->setVisible(TRUE); + if((GOVERNOR_LINDEN_ID == mParams.paid_to_id) || + (GOVERNOR_LINDEN_ID == mParams.paid_from_id)) + { + return rv; + } + if (mParams.notification_name == "PaymentReceived") { mAvatarIcon->setValue(mParams.paid_from_id); @@ -588,8 +596,7 @@ BOOL LLTransactionNotificationListItem::postBuild() mAvatarIcon->setValue(mParams.paid_to_id); mAvatarIconExp->setValue(mParams.paid_to_id); } - mAvatarIcon->setVisible(TRUE); - mAvatarIconExp->setVisible(TRUE); + return rv; } diff --git a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml index 43198f46f3..afc609de52 100644 --- a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml +++ b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml @@ -7,7 +7,7 @@ help_topic="notification_chiclet" save_rect="true" title="NOTIFICATIONS" - width="435" + width="350" min_width="435" height="550" min_height="150" |