Skip to content

[FIRE-35656] Add privacy option to block payment notification from mu… #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
casperwardensl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIRE-35656] Add privacy option to block payment notification from mu… #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions indra/newview/app_settings/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21130,6 +21130,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSBlockPaymentNotificationFromMutedAvatars</key>
<map>
<key>Comment</key>
<string>If enabled, the viewer not show incoming payment dialogs if the payment was sent by a blocked / muted avatar.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FSShowGroupTitleInTooltip</key>
<map>
<key>Comment</key>
Expand Down
7 changes: 6 additions & 1 deletion indra/newview/llviewermessage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5826,6 +5826,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)

bool you_paid_someone = (source_id == gAgentID);
std::string gift_suffix = (transaction_type == TRANS_GIFT ? "_gift" : "");
bool is_muted = false;
if (you_paid_someone)
{
if(!gSavedSettings.getBOOL("NotifyMoneySpend"))
Expand Down Expand Up @@ -5947,7 +5948,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)

// <FS:Ansariel> FIRE-21803: Prevent cheating IM restriction via pay message
//if (!reason.empty() && !LLMuteList::getInstance()->isMuted(source_id))
bool is_muted = LLMuteList::getInstance()->isMuted(source_id);
is_muted = LLMuteList::getInstance()->isMuted(source_id);
if (!reason.empty() && !is_muted && RlvActions::canReceiveIM(source_id))
// </FS:Ansariel>
{
Expand Down Expand Up @@ -6013,6 +6014,10 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
}
else
{
if (is_muted && gSavedSettings.getBOOL("FSBlockPaymentNotificationFromMutedAvatars"))
{
return;
}
LLAvatarNameCache::get(name_id, boost::bind(&money_balance_avatar_notify, _1, _2, notification, final_args, payload));
}
}
Expand Down
8 changes: 8 additions & 0 deletions indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,14 @@
name="FSCreateGiveInventoryParticleEffect"
top_pad="3"
width="350" />
<check_box
control_name="FSBlockPaymentNotificationFromMutedAvatars"
height="16"
label="Don't show payment notifications from muted avatars"
layout="topleft"
name="FSBlockPaymentNotificationFromMutedAvatars"
top_pad="3"
width="350" />

<button
follows="left|top"
Expand Down