1 files changed, 14 insertions, 0 deletions

diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index cc6d4b8..645d29a 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -303,6 +303,20 @@ void LLToolBar::refresh()
         }
         gSavedSettings.setBOOL("BuildBtnState", build_mode);
 
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-10 (RLVa-1.0.0g)
+        // Called per-frame so this really can't be slow
+        if (rlv_handler_t::isEnabled())
+        {
+                // If we're rez-restricted, we can still edit => allow build floater
+                // If we're edit-restricted, we can still rez => allow build floater
+                childSetEnabled("build_btn", !(gRlvHandler.hasBehaviour(RLV_BHVR_REZ) && gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) );
+
+                childSetEnabled("map_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP) );
+                childSetEnabled("radar_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWMINIMAP) );
+                childSetEnabled("inventory_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWINV) );
+        }
+// [/RLVa:KB]
+
         if (isInVisibleChain())
         {
                 updateCommunicateList();