summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2017-04-20 17:33:25 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2017-04-20 17:33:25 +0300
commitf9556f2e7348711c75a9fe13419122893967d834 (patch)
tree085ee7d8331440e97765e09008ae1cd2347737fe /indra/newview/llviewermessage.cpp
parent36095ba154e165ed2134dd2452774bdfdb6fa2fe (diff)
MAINT-1427 Resolving dupplicate message
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ab76653ba6..507087d1ae 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6042,7 +6042,14 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
return LLMarketplaceData::instance().getListing(llsdBlock["listing_id"].asInteger());
}
}
-
+
+ // Error Notification can come with and without reason
+ if (notificationID == "JoinGroupError" && llsdBlock.has("reason"))
+ {
+ LLNotificationsUtil::add("JoinGroupErrorReason", llsdBlock);
+ return true;
+ }
+
LLNotificationsUtil::add(notificationID, llsdBlock);
return true;
}