From 7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Sep 2009 17:52:41 -0700
Subject: Merged in jacek/next

---
 linden/indra/newview/llpanelpick.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

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

diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index 480f703..57ce6d5 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -400,7 +400,10 @@ void LLPanelPick::refresh()
 		mEnabledCheck->setEnabled(godlike);
 
 		mSetBtn->setVisible(godlike);
-		mSetBtn->setEnabled(godlike);
+		//mSetBtn->setEnabled(godlike);
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+		mSetBtn->setEnabled(godlike && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) );
+// [/RLVa:KB]
 	}
 	else
 	{
@@ -417,7 +420,10 @@ void LLPanelPick::refresh()
 		mEnabledCheck->setEnabled(FALSE);
 
 		mSetBtn->setVisible(is_self);
-		mSetBtn->setEnabled(is_self);
+		//mSetBtn->setEnabled(is_self);
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+		mSetBtn->setEnabled(is_self && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) );
+// [/RLVa]
 	}
 }
 
@@ -455,6 +461,12 @@ void LLPanelPick::onClickLandmark(void* data)
 // static
 void LLPanelPick::onClickSet(void* data)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+	if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+	{
+		return;
+	}
+// [/RLVa:KB]
     LLPanelPick* self = (LLPanelPick*)data;
 
 	// Save location for later.
-- 
cgit v1.1