Merged in jacek/next

1 files changed, 19 insertions, 1 deletions

diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index fa1883d..e101ea2 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -792,6 +792,9 @@ void LLPanelAvatarClassified::refresh()
         S32 tab_count = tabs ? tabs->getTabCount() : 0;
 
         bool allow_new = tab_count < MAX_CLASSIFIEDS;
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        allow_new &= !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC);
+// [/RLVa:KB]
         bool allow_delete = (tab_count > 0);
         bool show_help = (tab_count == 0);
 
@@ -927,6 +930,12 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
 // static
 void LLPanelAvatarClassified::onClickNew(void* data)
 {
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-04 (RLVa-1.0.0a)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                return;
+        }
+// [/RLVa:KB]
         LLPanelAvatarClassified* self = (LLPanelAvatarClassified*)data;
 
         gViewerWindow->alertXml("AddClassified",callbackNew,self);
@@ -1023,7 +1032,10 @@ void LLPanelAvatarPicks::refresh()
         BOOL self = (gAgent.getID() == getPanelAvatar()->getAvatarID());
         LLTabContainer* tabs = getChild<LLTabContainer>("picks tab");
         S32 tab_count = tabs ? tabs->getTabCount() : 0;
-        childSetEnabled("New...",    self && tab_count < MAX_AVATAR_PICKS);
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        childSetEnabled("New...", self && tab_count < MAX_AVATAR_PICKS && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) );
+// [/RLVa:KB]
+        //childSetEnabled("New...",    self && tab_count < MAX_AVATAR_PICKS);
         childSetEnabled("Delete...", self && tab_count > 0);
         childSetVisible("New...",    self && getPanelAvatar()->isEditable());
         childSetVisible("Delete...", self && getPanelAvatar()->isEditable());
@@ -1101,6 +1113,12 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
 // static
 void LLPanelAvatarPicks::onClickNew(void* data)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                return;
+        }
+// [/RLVa:KB]
         LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
         LLPanelPick* panel_pick = new LLPanelPick(FALSE);
         LLTabContainer* tabs =  self->getChild<LLTabContainer>("picks tab");