summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-06-18 23:29:57 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-06-18 23:29:57 +0300
commit537585a75e01adcf68538b83f1dc12d05e56bb54 (patch)
tree7576e2f7dc503d0ffb9bf7fadd30589d229334b2 /indra
parentda5cc13df2d3cff17cb6afb586da278709e9d40a (diff)
SL-15401 The grants modified rights toast ignores DND mode
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llcallingcard.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 6d20b23e9f..43e39d3073 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -645,7 +645,8 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
{
if(mBuddyInfo.find(agent_id) != mBuddyInfo.end())
{
- if((mBuddyInfo[agent_id]->getRightsGrantedFrom() ^ new_rights) & LLRelationship::GRANT_MODIFY_OBJECTS)
+ if (((mBuddyInfo[agent_id]->getRightsGrantedFrom() ^ new_rights) & LLRelationship::GRANT_MODIFY_OBJECTS)
+ && !gAgent.isDoNotDisturb())
{
LLSD args;
args["NAME"] = LLSLURL("agent", agent_id, "displayname").getSLURLString();