From c84fe50f18d39adf1bb712927a71628d343781d0 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 21 Sep 2015 14:32:36 +0300
Subject: [PATCH] MAINT-5425 FIXED No icon is shown for certain transaction
notifications.
---
indra/newview/llnotificationlistitem.cpp | 11 +++++++++--
.../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"
--
GitLab