diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-30 11:02:15 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-30 11:02:15 -0600 |
| commit | f713fe492f8b86a0743e0a553d62f06ff62500bb (patch) | |
| tree | f45ce691e7f07a64e659f3f2742e005fa857bfa8 /indra/newview/llspatialpartition.cpp | |
| parent | 1751650dbcad4ea66b2c3779aa52960ec1640466 (diff) | |
fix for SH-4295: Interesting: Teleporting to previous location leave some objects invisible.
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rwxr-xr-x | indra/newview/llspatialpartition.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 725afb9014..c7cd0919ec 100755 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -68,6 +68,7 @@ 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 @@ -900,7 +901,7 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion) { setState(LLSpatialGroup::GEOM_DIRTY | LLSpatialGroup::IMAGE_DIRTY); - if (!keep_occlusion) + if (!keep_occlusion && !LLSpatialPartition::sTeleportRequested) { //going to need a rebuild gPipeline.markRebuild(this, TRUE); } @@ -1392,6 +1393,8 @@ 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); @@ -1404,7 +1407,7 @@ public: { continue; } - if (drawable->getVObj().notNull() && !group->getSpatialPartition()->mRenderByGroup) + if (!mNoRebuild && drawable->getVObj().notNull() && !group->getSpatialPartition()->mRenderByGroup) { gPipeline.markRebuild(drawable, LLDrawable::REBUILD_ALL, TRUE); } @@ -1416,6 +1419,9 @@ public: traverse(bridge->mOctree); } } + +private: + BOOL mNoRebuild; }; void LLSpatialPartition::restoreGL() @@ -1424,7 +1430,7 @@ void LLSpatialPartition::restoreGL() void LLSpatialPartition::resetVertexBuffers() { - LLOctreeDirty dirty; + LLOctreeDirty dirty(sTeleportRequested); dirty.traverse(mOctree); } |