MAINT-5425 FIXED No icon is shown for certain transaction notifications.

1 files changed, 9 insertions, 2 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;
 }