summaryrefslogtreecommitdiff
path: root/indra/newview/llspatialpartition.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2023-03-13 11:16:23 -0500
committerDave Parks <davep@lindenlab.com>2023-03-13 11:16:23 -0500
commit8d263197f0649e3b49044d6f7c12277c2361bdba (patch)
tree5daa7783d32e2df9c5e949d37892cf7e4cca265d /indra/newview/llspatialpartition.cpp
parent88d3cc680dd10fcb0397b366e73899c6e414ad5c (diff)
SL-19371 Fix for occlusion culling getting stuck after teleport.
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r--indra/newview/llspatialpartition.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 92fccfcfd6..fc9b3093e8 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -64,8 +64,6 @@ bool LLSpatialGroup::sNoDelete = false;
static F32 sLastMaxTexPriority = 1.f;
static F32 sCurMaxTexPriority = 1.f;
-bool LLSpatialPartition::sTeleportRequested = false;
-
//static counter for frame to switch LOD on
void sg_assert(BOOL expr)
@@ -1295,8 +1293,6 @@ void drawBoxOutline(const LLVector4a& pos, const LLVector4a& size)
class LLOctreeDirty : public OctreeTraveler
{
public:
- LLOctreeDirty(bool no_rebuild) : mNoRebuild(no_rebuild){}
-
virtual void visit(const OctreeNode* state)
{
LLSpatialGroup* group = (LLSpatialGroup*) state->getListener(0);
@@ -1309,7 +1305,7 @@ public:
{
continue;
}
- if (!mNoRebuild && drawable->getVObj().notNull() && !group->getSpatialPartition()->mRenderByGroup)
+ if (drawable->getVObj().notNull() && !group->getSpatialPartition()->mRenderByGroup)
{
gPipeline.markRebuild(drawable, LLDrawable::REBUILD_ALL, TRUE);
}
@@ -1321,9 +1317,6 @@ public:
traverse(bridge->mOctree);
}
}
-
-private:
- BOOL mNoRebuild;
};
void LLSpatialPartition::restoreGL()
@@ -1332,7 +1325,7 @@ void LLSpatialPartition::restoreGL()
void LLSpatialPartition::resetVertexBuffers()
{
- LLOctreeDirty dirty(sTeleportRequested);
+ LLOctreeDirty dirty;
dirty.traverse(mOctree);
}