1 files changed, 14 insertions, 2 deletions

diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index 43ecd27..b26b51a 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -401,7 +401,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
         {
@@ -418,7 +421,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]
         }
 }
 
@@ -456,6 +462,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.