Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.

Made a few non-functional changes to help it apply.

1 files changed, 11 insertions, 0 deletions

diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index 9e837a6..5590ab1 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -54,6 +54,10 @@
 #include "lloverlaybar.h" // for gOverlayBar
 #include "lluictrlfactory.h"
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
+#include "rlvhandler.h"
+// [/RLVa:KB]
+  
 // Globals
 LLNotifyBoxView* gNotifyBoxView = NULL;
 
@@ -328,6 +332,13 @@ LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLSt
                 // TODO: Make a separate archive for these.
                 LLChat chat(mMessage);
                 chat.mSourceType = CHAT_SOURCE_SYSTEM;
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
+                if (rlv_handler_t::isEnabled())
+                {
+                        // Notices should already have their contents filtered where necessary
+                        chat.mRlvLocFiltered = chat.mRlvNamesFiltered = TRUE;
+                }
+// [/RLVa:KB]
                 LLFloaterChat::getInstance(LLSD())->addChatHistory(chat);
         }
         else