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:
@@ -1056,68 +1056,6 @@ public:
|
||||
//static bool enableIfCopyable( void* userdata );
|
||||
};
|
||||
|
||||
class LLTaskLSLBridge : public LLTaskScriptBridge
|
||||
{
|
||||
public:
|
||||
LLTaskLSLBridge(LLPanelObjectInventory* panel,
|
||||
const LLUUID& uuid,
|
||||
const std::string& name) :
|
||||
LLTaskScriptBridge(panel, uuid, name) {}
|
||||
|
||||
virtual bool canOpenItem() const { return true; }
|
||||
virtual void openItem();
|
||||
virtual bool removeItem();
|
||||
//virtual void buildContextMenu(LLMenuGL& menu);
|
||||
|
||||
//static void copyToInventory(void* userdata);
|
||||
};
|
||||
|
||||
// virtual
|
||||
void LLTaskLSLBridge::openItem()
|
||||
{
|
||||
LL_INFOS() << "LLTaskLSLBridge::openItem() " << mUUID << LL_ENDL;
|
||||
LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
|
||||
if(!object || object->isInventoryPending())
|
||||
{
|
||||
return;
|
||||
}
|
||||
// [RLVa:KB] - Checked: 2010-03-27 (RLVa-1.2.0b) | Modified: RLVa-1.1.0a
|
||||
if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.isLockedAttachment(object->getRootEdit())) )
|
||||
{
|
||||
RlvUtil::notifyBlockedViewXXX(LLAssetType::AT_SCRIPT);
|
||||
return;
|
||||
}
|
||||
// [/RLVa:KB]
|
||||
if (object->permModify() || gAgent.isGodlike())
|
||||
{
|
||||
LLSD floater_key;
|
||||
floater_key["taskid"] = mPanel->getTaskUUID();
|
||||
floater_key["itemid"] = mUUID;
|
||||
|
||||
LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", floater_key, TAKE_FOCUS_YES);
|
||||
if (preview)
|
||||
{
|
||||
LLSelectNode *node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, true);
|
||||
if (node && node->mValid)
|
||||
{
|
||||
preview->setObjectName(node->mName);
|
||||
}
|
||||
preview->setObjectID(mPanel->getTaskUUID());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LLNotificationsUtil::add("CannotOpenScriptObjectNoMod");
|
||||
}
|
||||
}
|
||||
|
||||
// virtual
|
||||
bool LLTaskLSLBridge::removeItem()
|
||||
{
|
||||
LLFloaterReg::hideInstance("preview_scriptedit", LLSD(mUUID));
|
||||
return LLTaskInvFVBridge::removeItem();
|
||||
}
|
||||
|
||||
///----------------------------------------------------------------------------
|
||||
/// Class LLTaskObjectBridge
|
||||
///----------------------------------------------------------------------------
|
||||
@@ -1448,11 +1386,6 @@ LLTaskInvFVBridge* LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory*
|
||||
object_id,
|
||||
object_name);
|
||||
break;
|
||||
case LLAssetType::AT_LSL_TEXT:
|
||||
new_bridge = new LLTaskLSLBridge(panel,
|
||||
object_id,
|
||||
object_name);
|
||||
break;
|
||||
case LLAssetType::AT_SETTINGS:
|
||||
new_bridge = new LLTaskSettingsBridge(panel,
|
||||
object_id,
|
||||
|
||||
Reference in New Issue
Block a user