From 806cd01a0da1c67aaccd0bdcb40c104d48ed9d25 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Wed, 23 Oct 2013 15:45:15 -0600
Subject: fix for SH-4551: Interesting: some attachments do not appear after
teleport
---
indra/newview/llspatialpartition.cpp | 2 +-
indra/newview/llvovolume.cpp | 8 --------
indra/newview/pipeline.cpp | 1 -
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 449a192332..55c0acd3f9 100755
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -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);
}
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 52c4c24686..2828f1ba6a 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -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;
}
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index efc3663ff3..2cf59d212b 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -7415,7 +7415,6 @@ void LLPipeline::doResetVertexBuffers()
LLSpatialPartition::sTeleportRequested = FALSE;
LLWorld::getInstance()->clearAllVisibleObjects();
- clearRebuildGroups();
clearRebuildDrawables();
}
--
cgit v1.2.3