Merge branch 'weekly' of http://github.com/imprudence/imprudence into weekly

1 files changed, 9 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 981c9bc..1616b97 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -63,6 +63,10 @@
 #include "llappviewer.h" // for gPacificDaylightTime
 #include "viewertime.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 static LLRegisterWidget<LLViewerTextEditor> r("text_editor");
 
 ///----------------------------------------------------------------------------
@@ -97,9 +101,10 @@ public:
                 }
                 else
                 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) )
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE))
                         {
+                                RlvNotifications::notifyBlockedViewNote();
                                 return;
                         }
 // [/RLVa:KB]
@@ -1388,9 +1393,10 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item, llwchar wc)
 
 void LLViewerTextEditor::openEmbeddedTexture( LLInventoryItem* item, llwchar wc )
 {
-// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Added: RLVa-1.0.5c
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
         if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))
         {
+                RlvNotifications::notifyBlockedViewTexture();
                 return;
         }
 // [/RLVa:KB]