livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-29461: Upload Transactions preview blank until opened

meow-7.2.2
Ansariel 2020-04-12 23:01:54 +02:00
parent 5cf982233f
commit e7d97b58a3
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
indra/newview/llnotificationlistitem.cpp
View File

@ -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;