Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in RLVa. Viewer broken!

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/llpanelpick.cpp
View File

@@ -60,8 +60,9 @@
#include "llviewerregion.h"
#include "llviewerwindow.h"
// [RLVa:KB]
#include "rlvhandler.h"
// [/RLVa:KB]
//For pick import and export - RK
@@ -490,7 +491,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]
}
@@ -510,7 +514,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]
}
}
@@ -551,12 +558,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.