Merged in RLVa. Viewer broken!

indra/newview/llfloaterbeacons.cpp

@@ -38,6 +38,9 @@
 #include "llcheckboxctrl.h"
 #include "pipeline.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
 {
@@ -73,6 +76,13 @@ BOOL LLFloaterBeacons::postBuild()
 // Too bad we can't just add control_name="BeaconAlwaysOn" 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( "BeaconAlwaysOn", TRUE);
 }