diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-04-20 17:33:25 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-04-20 17:33:25 +0300 |
| commit | f9556f2e7348711c75a9fe13419122893967d834 (patch) | |
| tree | 085ee7d8331440e97765e09008ae1cd2347737fe /indra | |
| parent | 36095ba154e165ed2134dd2452774bdfdb6fa2fe (diff) | |
MAINT-1427 Resolving dupplicate message
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 |
2 files changed, 9 insertions, 2 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; } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ebe1fdc4c7..5837b3f668 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -933,7 +933,7 @@ Error processing your group membership request. <notification icon="alertmodal.tga" - name="JoinGroupError" + name="JoinGroupErrorReason" type="alertmodal"> Unable to join group: [reason] <tag>group_id</tag> |