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

23
indra/newview/llpreviewscript.cpp
View File

@@ -87,6 +87,9 @@
#include "llappviewer.h"
#include "llpanelinventory.h"
// [RLVa:KB]
#include "rlvhandler.h"
// [/RLVa:KB]
const std::string HELLO_LSL =
"default\n"
@@ -2070,6 +2073,12 @@ void LLLiveLSLEditor::onRunningCheckboxClicked( LLUICtrl*, void* userdata )
LLCheckBoxCtrl* runningCheckbox = self->getChild<LLCheckBoxCtrl>("running");
BOOL running = runningCheckbox->get();
//self->mRunningCheckbox->get();
// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) )
{
return;
}
// [/RLVa:KB]
if( object )
{
LLMessageSystem* msg = gMessageSystem;
@@ -2095,6 +2104,12 @@ void LLLiveLSLEditor::onReset(void *userdata)
LLLiveLSLEditor* self = (LLLiveLSLEditor*) userdata;
LLViewerObject* object = gObjectList.findObject( self->mObjectID );
// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) )
{
return;
}
// [/RLV:KB]
if(object)
{
LLMessageSystem* msg = gMessageSystem;
@@ -2520,6 +2535,14 @@ void LLLiveLSLEditor::onLoad(void* userdata)
void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save)
{
LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(gObjectList.findObject(self->mObjectID), RLV_LOCK_REMOVE)) )
{
return;
}
// [/RLV:KB]
self->mCloseAfterSave = close_after_save;
self->saveIfNeeded();
}