From a75110587d25059a4e088db72ce79d88d5449d48 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Thu, 26 May 2011 21:47:58 +0200
Subject: [PATCH] - internal : fix various RLVa merging issues

---
 indra/newview/llappviewer.cpp       |  4 ----
 indra/newview/llavatarlist.cpp      |  2 +-
 indra/newview/llfloaterworldmap.cpp |  4 ----
 indra/newview/llviewermessage.cpp   | 19 -------------------
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3b937fc61a..ff422fbcfb 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -88,10 +88,6 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
-// [RLVa:KB] - Checked: 2010-05-03 (RLVa-1.2.0g)
-#include "rlvhandler.h"
-// [/RLVa:KB]
-
 #include "llweb.h"
 #include "llsecondlifeurls.h"
 #include "llupdaterservice.h"
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index d567aa311f..f4776ede01 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -243,10 +243,10 @@ LLAvatarList::LLAvatarList(const Params& p)
 , mIgnoreGlobalIcons(false)
 // [RLVa:KB] - Checked: 2010-04-05 (RLVa-1.2.2a) | Added: RLVa-1.2.0d
 , mRlvCheckShowNames(false)
+// [/RLVa:KB]
 , mShowAge(false)
 , mShowPaymentStatus(false)
 , mItemHeight(0)
-// [/RLVa:KB]
 // [Ansariel: Colorful radar]
 , mUseRangeColors(false)
 // [Ansariel: Colorful radar]
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index eaeac9cb73..8d94dc609b 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -78,10 +78,6 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
-// [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a)
-#include "rlvhandler.h"
-// [/RLVa:KB]
-
 //---------------------------------------------------------------------------
 // Constants
 //---------------------------------------------------------------------------
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a625f65e86..b9cc9f614a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2807,25 +2807,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			return;
 		}
 
-		if (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM))
-		{
-			switch (pIMSession->mSessionType)
-			{
-				case LLIMModel::LLIMSession::GROUP_SESSION:	// Group chat: allow if group is a sendim exception
-					if ( (from_id != gAgent.getID()) && (!gRlvHandler.isException(RLV_BHVR_RECVIM, session_id)) )
-						return;
-					break;
-				case LLIMModel::LLIMSession::ADHOC_SESSION:	// Conference chat: allow if the sender is a sendim exception
-					if ( (from_id != gAgent.getID()) && (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id)) )
-						message = RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM);
-					break;
-				default:
-					RLV_ASSERT(false);
-					return;
-			}
-		}
-// [/RLVa:KB]
-
 		if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)) )
 		{
 			switch (pIMSession->mSessionType)