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:
@@ -63,7 +63,6 @@
|
||||
#include "lluiusage.h"
|
||||
|
||||
// Firestorm includes
|
||||
#include "fslslbridge.h"
|
||||
#include "lggbeammaps.h"
|
||||
#include "piemenu.h"
|
||||
#include "pieslice.h"
|
||||
@@ -1664,16 +1663,6 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view
|
||||
// <FS:TT> ReplaceWornItemsOnly
|
||||
gInventory.wearAttachmentsOnAvatarCheckRemove(viewer_object, attachment);
|
||||
// </FS:TT>
|
||||
// <FS:TT> Client LSL Bridge
|
||||
if (attachment->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && gSavedSettings.getBOOL("UseLSLBridge"))
|
||||
{
|
||||
LLViewerInventoryItem* inv_object = gInventory.getItem(viewer_object->getAttachmentItemID());
|
||||
if (inv_object && inv_object->getName() == FSLSLBridge::instance().currentFullName())
|
||||
{
|
||||
FSLSLBridge::instance().processAttach(viewer_object, attachment);
|
||||
}
|
||||
}
|
||||
// </FS:TT>
|
||||
updateLODRiggedAttachments();
|
||||
|
||||
// [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Modified: RLVa-1.2.1a
|
||||
@@ -1728,16 +1717,6 @@ bool LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
|
||||
(*mAttachmentSignal)(viewer_object, pAttachPt, ACTION_DETACH);
|
||||
}
|
||||
|
||||
// <FS:TT> Client LSL Bridge
|
||||
if (pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME)
|
||||
{
|
||||
LLViewerInventoryItem* inv_object = gInventory.getItem(viewer_object->getAttachmentItemID());
|
||||
if (inv_object && inv_object->getName() == FSLSLBridge::instance().currentFullName())
|
||||
{
|
||||
FSLSLBridge::instance().processDetach(viewer_object, pAttachPt);
|
||||
}
|
||||
}
|
||||
// </FS:TT>
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1811,10 +1790,6 @@ bool LLVOAvatarSelf::detachAttachmentIntoInventory(const LLUUID &item_id)
|
||||
{
|
||||
LLInventoryItem* item = gInventory.getItem(item_id);
|
||||
// if (item)
|
||||
// [RLVa:KB] - Checked: 2010-09-04 (RLVa-1.2.1c) | Added: RLVa-1.2.1c
|
||||
if ( (item) && (((!rlv_handler_t::isEnabled()) || (gRlvAttachmentLocks.canDetach(item))) ||
|
||||
FSLSLBridge::instance().canDetach(item->getUUID())) )
|
||||
// [/RLVa:KB]
|
||||
{
|
||||
gMessageSystem->newMessageFast(_PREHASH_DetachAttachmentIntoInv);
|
||||
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
|
||||
|
||||
Reference in New Issue
Block a user