Quitado código del LSL bridge y funciones dependientes
Corrección de errores previos en la migración. Cambiada la pantalla de inicio (Splash Screen)
This commit is contained in:
@@ -23,10 +23,6 @@
|
||||
#include "llviewerobjectlist.h"
|
||||
#include "pipeline.h"
|
||||
|
||||
//<FS:TS> FIRE-4453 bridge detached by the RLV command @remattach=force
|
||||
#include "fslslbridge.h"
|
||||
//</FS:TS> FIRE-4453
|
||||
|
||||
#include "rlvcommon.h"
|
||||
#include "rlveffects.h"
|
||||
#include "rlvhelper.h"
|
||||
@@ -1416,9 +1412,6 @@ bool RlvForceWear::isForceDetachable(const LLViewerObject* pAttachObj, bool fChe
|
||||
&& ( (idExcept.isNull()) ? (!gRlvAttachmentLocks.isLockedAttachment(pAttachObj))
|
||||
: (!gRlvAttachmentLocks.isLockedAttachmentExcept(pAttachObj, idExcept)) )
|
||||
&& (isStrippable(pAttachObj->getAttachmentItemID()))
|
||||
//<FS:TS> FIRE-4453 bridge detached by the RLV command @remattach=force
|
||||
&& (pAttachObj->getID() != FSLSLBridge::instance().getAttachedID())
|
||||
//</FS:TS> FIRE-4453
|
||||
#ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
|
||||
&& ( (!fCheckComposite) || (!RlvSettings::getEnableComposites()) ||
|
||||
(!gRlvHandler.getCompositeInfo(pAttachPt->getItemID(), NULL, &pFolder)) || (gRlvHandler.canTakeOffComposite(pFolder)) )
|
||||
|
||||
Reference in New Issue
Block a user