From 89a510de10c48ebcf82b98a962e4bf66477dcc93 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 4 Sep 2009 01:56:20 -0500
Subject: Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.

Made a few non-functional changes to help it apply.
---
 linden/indra/newview/lltoolbar.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'linden/indra/newview/lltoolbar.cpp')

diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index 8202191..6d04294 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -307,6 +307,20 @@ void LLToolBar::refresh()
 	}
 	gSavedSettings.setBOOL("BuildBtnState", build_mode);
 
+// [RLVa:KB] - Version: 1.22.11 | 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]
+
 	updateCommunicateList();
 }
 
@@ -479,6 +493,14 @@ void LLToolBar::onClickSit(void*)
 	}
 	else
 	{
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+		// NOTE-RLVa: dead code?
+		if (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
+		{
+			return;
+		}
+// [/RLVa:KB]
+
 		// stand up
 		gAgent.setFlying(FALSE);
 		gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
-- 
cgit v1.1