From e7d97b58a346c9187e572865d047203a1bcc562e Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 12 Apr 2020 23:01:54 +0200
Subject: [PATCH] FIRE-29461: Upload Transactions preview blank until opened

---
 indra/newview/llnotificationlistitem.cpp | 69 +++++++++++++-----------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp
index efd068d155..cbfd3fcc2d 100644
--- a/indra/newview/llnotificationlistitem.cpp
+++ b/indra/newview/llnotificationlistitem.cpp
@@ -598,8 +598,13 @@ LLTransactionNotificationListItem::LLTransactionNotificationListItem(const Param
 
 BOOL LLTransactionNotificationListItem::postBuild()
 {
-	// <FS:Ansariel> Unscrew avatar icon for transaction messages
-	mParams.title = mParams.payment_message;
+    // <FS:Ansariel> Unscrew avatar icon for transaction messages
+    if (mParams.notification_name == "PaymentReceived" ||
+        mParams.notification_name == "PaymentSent")
+    {
+        mParams.title = mParams.payment_message;
+    }
+    // </FS:Ansariel>
 
     BOOL rv = LLNotificationListItem::postBuild();
 
@@ -624,42 +629,42 @@ BOOL LLTransactionNotificationListItem::postBuild()
         // <FS:Ansariel> Unscrew avatar icon for transaction messages
         //mAvatarIcon->setValue(mParams.paid_from_id);
         //mAvatarIconExp->setValue(mParams.paid_from_id);
-		if (!mParams.payment_is_group)
-		{
-			mAvatarIcon->setValue(mParams.paid_from_id);
-			mAvatarIconExp->setValue(mParams.paid_from_id);
-		}
-		else
-		{
-			mGroupIcon->setValue(mParams.paid_from_id);
-			mGroupIconExp->setValue(mParams.paid_from_id);
-			mGroupIcon->setVisible(TRUE);
-			mGroupIconExp->setVisible(TRUE);
-			mAvatarIcon->setVisible(FALSE);
-			mAvatarIconExp->setVisible(FALSE);
-		}
-		// </FS:Ansariel>
+        if (!mParams.payment_is_group)
+        {
+            mAvatarIcon->setValue(mParams.paid_from_id);
+            mAvatarIconExp->setValue(mParams.paid_from_id);
+        }
+        else
+        {
+            mGroupIcon->setValue(mParams.paid_from_id);
+            mGroupIconExp->setValue(mParams.paid_from_id);
+            mGroupIcon->setVisible(TRUE);
+            mGroupIconExp->setVisible(TRUE);
+            mAvatarIcon->setVisible(FALSE);
+            mAvatarIconExp->setVisible(FALSE);
+        }
+        // </FS:Ansariel>
     }
     else if (mParams.notification_name == "PaymentSent")
     {
         // <FS:Ansariel> Unscrew avatar icon for transaction messages
         //mAvatarIcon->setValue(mParams.paid_to_id);
         //mAvatarIconExp->setValue(mParams.paid_to_id);
-		if (!mParams.payment_is_group)
-		{
-			mAvatarIcon->setValue(mParams.paid_to_id);
-			mAvatarIconExp->setValue(mParams.paid_to_id);
-		}
-		else
-		{
-			mGroupIcon->setValue(mParams.paid_to_id);
-			mGroupIconExp->setValue(mParams.paid_to_id);
-			mGroupIcon->setVisible(TRUE);
-			mGroupIconExp->setVisible(TRUE);
-			mAvatarIcon->setVisible(FALSE);
-			mAvatarIconExp->setVisible(FALSE);
-		}
-		// </FS:Ansariel>
+        if (!mParams.payment_is_group)
+        {
+            mAvatarIcon->setValue(mParams.paid_to_id);
+            mAvatarIconExp->setValue(mParams.paid_to_id);
+        }
+        else
+        {
+            mGroupIcon->setValue(mParams.paid_to_id);
+            mGroupIconExp->setValue(mParams.paid_to_id);
+            mGroupIcon->setVisible(TRUE);
+            mGroupIconExp->setVisible(TRUE);
+            mAvatarIcon->setVisible(FALSE);
+            mAvatarIconExp->setVisible(FALSE);
+        }
+        // </FS:Ansariel>
     }
 
     return rv;