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

inconsistent import working!

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-03 06:43:33 -03:00
parent f537a34e44
commit 46a32e5348
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llviewerobjectlist.cpp
View File

@@ -75,6 +75,10 @@
#include "llappviewer.h" #include "llappviewer.h"
// <edit>
#include "llimportobject.h"
// </edit>
extern F32 gMinObjectDistance; extern F32 gMinObjectDistance;
extern BOOL gAnimateTextures; extern BOOL gAnimateTextures;
@@ -544,6 +548,28 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
} }
processUpdateCore(objectp, user_data, i, update_type, NULL, justCreated); 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>
} }
LLVOAvatar::cullAvatarsByPixelArea(); LLVOAvatar::cullAvatarsByPixelArea();