Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 13 insertions, 0 deletions

diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 08e274b..790e20b 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -1515,6 +1515,19 @@ public:
                         {
                                 return;
                         }
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                        // TODO-RLVa: duplicate from process_improved_im()?
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM))
+                        {
+                                if (gAgent.isInGroup(session_id))
+                                {
+                                        if (!gRlvHandler.isException(RLV_BHVR_RECVIM, session_id))
+                                                return;
+                                }
+                                else if (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))
+                                        message = message.substr(0, message_offset) + rlv_handler_t::cstrBlockedRecvIM;
+                        }
+// [/RLVa:KB]
 
                         // standard message, not from system
                         std::string saved;