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

Removed Import/Export

Browse Source
This commit is contained in:
Siana Gearz
2011-04-18 23:28:27 +02:00
parent 8018a8842f
commit 5d5231fe8c
20 changed files with 16 additions and 3624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llviewerobjectlist.cpp
View File

@@ -75,10 +75,6 @@
#include "llappviewer.h"
// <edit>
#include "llimportobject.h"
// </edit>
extern F32 gMinObjectDistance;
extern BOOL gAnimateTextures;
@@ -548,28 +544,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
}
processUpdateCore(objectp, user_data, i, update_type, NULL, justCreated);
}
// <edit>
if(justCreated && LLXmlImport::sImportInProgress)
{
if(objectp)
{
LLViewerObject* parent = (LLViewerObject*)objectp->getParent();
if(parent)
{
if(parent->getID() == gAgent.getID())
{
LLXmlImport::onNewAttachment(objectp);
}
}
else if( objectp->permYouOwner()
&& (objectp->getPCode() == LLXmlImport::sSupplyParams->getPCode())
&& (objectp->getScale() == LLXmlImport::sSupplyParams->getScale()))
{
LLXmlImport::onNewPrim(objectp);
}
}
}
// </edit>
objectp->setLastUpdateType(update_type);
objectp->setLastUpdateCached(cached);