From f9556f2e7348711c75a9fe13419122893967d834 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 20 Apr 2017 17:33:25 +0300
Subject: MAINT-1427 Resolving dupplicate message

---
 indra/newview/llviewermessage.cpp                    | 9 ++++++++-
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'indra/newview')

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>
-- 
cgit v1.2.3