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/llstatusbar.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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

diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index b0ef61f..012db6f 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -568,6 +568,15 @@ void LLStatusBar::refresh()
 		mRegionDetails.mTraffic = 0.0f;
 	}
 
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-1.0.0a
+	if ( (region) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )	// region == NULL if we loose our connection to the grid
+	{
+		// TODO-RLVa: find out whether the LCD code is still used because if so then we need to filter that as well
+		location_name = llformat("%s (%s) - %s", 
+			rlv_handler_t::cstrHiddenRegion.c_str(), region->getSimAccessString().c_str(), rlv_handler_t::cstrHidden.c_str());
+	}
+// [/RLVa:KB]
+
 	mTextParcelName->setText(location_name);
 
 
@@ -814,6 +823,12 @@ static void onClickScripts(void*)
 
 static void onClickBuyLand(void*)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+	if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+	{
+		return;
+	}
+// [/RLVa:KB]
 	LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
 	LLViewerParcelMgr::getInstance()->startBuyLand();
 }
-- 
cgit v1.1