Merged in RLVa. Viewer broken!

This commit is contained in:
Siana Gearz
2010-11-07 05:05:47 +01:00
parent ae4a9521af
commit 740b570168
94 changed files with 11249 additions and 503 deletions

View File

@@ -71,6 +71,10 @@
#include "llviewerwindow.h" // for window width, height
#include "llappviewer.h" // abortQuit()
// [RLVa:KB]
#include "rlvhandler.h"
// [/RLVa:KB]
const S32 MINIMUM_PRICE_FOR_LISTING = 50; // L$
const S32 MATURE_UNDEFINED = -1;
const S32 MATURE_CONTENT = 1;
@@ -778,7 +782,10 @@ void LLPanelClassified::refresh()
mClickThroughText->setVisible(is_self);
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:KB]
mUpdateBtn->setEnabled(is_self && checkDirty());
mUpdateBtn->setVisible(is_self);
@@ -979,6 +986,12 @@ void LLPanelClassified::onClickLandmark(void* data)
// static
void LLPanelClassified::onClickSet(void* data)
{
// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
{
return;
}
// [/RLVa:KB]
LLPanelClassified* self = (LLPanelClassified*)data;
// Save location for later.