livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for SH-4551: Interesting: some attachments do not appear after teleport

meow-7.2.2
Xiaohong Bao 2013-10-23 15:45:15 -06:00
parent 4264060662
commit 806cd01a0d
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llspatialpartition.cpp
View File

@ -903,7 +903,7 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion)
{
setState(LLSpatialGroup::GEOM_DIRTY | LLSpatialGroup::IMAGE_DIRTY);
if (!keep_occlusion && !LLSpatialPartition::sTeleportRequested)
if (!keep_occlusion)
{ //going to need a rebuild
gPipeline.markRebuild(this, TRUE);
}

8
indra/newview/llvovolume.cpp
View File

@ -1298,14 +1298,6 @@ BOOL LLVOVolume::calcLOD()
mLOD = cur_detail;
return TRUE;
}
else if(cur_detail > MIN_LOD)
{
LLFace* facep = mDrawable->getFace(0);
if(facep && !facep->getVertexBuffer())
{
return TRUE; //force geometry update if visible object does not have vertex buffer.
}
}
return FALSE;
}

1
indra/newview/pipeline.cpp
View File

@ -7415,7 +7415,6 @@ void LLPipeline::doResetVertexBuffers()
LLSpatialPartition::sTeleportRequested = FALSE;
LLWorld::getInstance()->clearAllVisibleObjects();
clearRebuildGroups();
clearRebuildDrawables();
}