From de9ffca2f3963a7bb02148707668d9c4dfb9b1a4 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 1 Dec 2017 12:36:22 +0100
Subject: [PATCH] FIRE-20385: Don't show group invitation for groups agent is
 already a member of

---
 indra/newview/llviewermessage.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 4b4a253da9..7b2f028b72 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3457,6 +3457,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		break;
 	case IM_GROUP_INVITATION:
 		{
+			// <FS:Ansariel> FIRE-20385: Don't show group invitation for groups agent is already a member of
+			if (gAgent.isInGroup(from_id))
+			{
+				LL_INFOS("Messaging") << "Received group invitation for group " << from_id << " but we are already a member" << LL_ENDL;
+				return;
+			}
+			// </FS:Ansariel>
+
 			if (!is_muted)
 			{
 				// group is not blocked, but we still need to check agent that sent the invitation