Merged in jacek/next

1 files changed, 10 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterbeacons.cpp b/linden/indra/newview/llfloaterbeacons.cpp
index d636776..7403df2 100644
--- a/linden/indra/newview/llfloaterbeacons.cpp
+++ b/linden/indra/newview/llfloaterbeacons.cpp
@@ -37,6 +37,9 @@
 #include "llcheckboxctrl.h"
 #include "pipeline.h"
 
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
+#include "llagent.h"
+// [/RLVa:KB]
 
 LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
 {
@@ -72,6 +75,13 @@ BOOL LLFloaterBeacons::postBuild()
 // Too bad we can't just add control_name="BeaconsEnabled" to the XML.
 void LLFloaterBeacons::open()
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLFloater::open();
         gSavedSettings.setBOOL( "BeaconsEnabled", TRUE);
 }