Attempt to squash spatial partition crash.

indra/newview/lldrawable.cpp

@@ -1596,11 +1596,7 @@ void LLSpatialBridge::cleanupReferences()
 	LLDrawable::cleanupReferences();
 	if (mDrawable)
 	{
-		/*
+		mDrawable->setGroup(NULL);
-		
-		DON'T DO THIS -- this should happen through octree destruction
-
-		mDrawable->setSpatialGroup(NULL);
 		if (mDrawable->getVObj())
 		{
 			LLViewerObject::const_child_list_t& child_list = mDrawable->getVObj()->getChildren();
@@ -1611,14 +1607,15 @@ void LLSpatialBridge::cleanupReferences()
 				LLDrawable* drawable = child->mDrawable;
 				if (drawable)
 				{
-					drawable->setSpatialGroup(NULL);
+					drawable->setGroup(NULL);
+				}
 			}
 		}
-		}*/
 
-		LLPointer<LLDrawable> drawablep = mDrawable;
+		LLPointer<LLSpatialBridge> bridgep = mDrawable->getSpatialBridge();
+		mDrawable->setSpatialBridge(nullptr);
 		mDrawable = nullptr;
-		drawablep->setSpatialBridge(nullptr);
+		bridgep = nullptr;
 	}
 }
 

indra/newview/llspatialpartition.h

@@ -316,7 +316,7 @@ public:
 
 	void drawObjectBox(LLColor4 col);
 
-	LLSpatialPartition* getSpatialPartition() const {return (LLSpatialPartition*)mSpatialPartition;}
+	LLSpatialPartition* getSpatialPartition() const {return mSpatialPartition;}
 
 	 //LISTENER FUNCTIONS
 	void handleInsertion(const TreeNode* node, LLViewerOctreeEntry* face) final override;

indra/newview/llvieweroctree.cpp

@@ -846,10 +846,12 @@ public:
 };
 
 
-LLOcclusionCullingGroup::LLOcclusionCullingGroup(OctreeNode* node, LLViewerOctreePartition* part) : 
+LLOcclusionCullingGroup::LLOcclusionCullingGroup(OctreeNode* node, LLSpatialPartition* part) :
 	LLViewerOctreeGroup(node),
 	mSpatialPartition(part)
 {
+	llassert(part);
+	mSpatialPartition->mGroups.push_back(this);
 	part->mLODSeed = (part->mLODSeed+1)%part->mLODPeriod;
 	mLODHash = part->mLODSeed;
 
@@ -867,12 +869,21 @@ LLOcclusionCullingGroup::LLOcclusionCullingGroup(OctreeNode* node, LLViewerOctre
 
 LLOcclusionCullingGroup::~LLOcclusionCullingGroup()
 {
+	if (mSpatialPartition)
+	{
+		auto it = std::find_if(mSpatialPartition->mGroups.begin(), mSpatialPartition->mGroups.end(), [this](LLOcclusionCullingGroup* rhs) {return rhs == this; });
+		llassert_always(it != mSpatialPartition->mGroups.end());
+		if (it != mSpatialPartition->mGroups.end())
+		{
+			mSpatialPartition->mGroups.erase(it);
+		}
+	}
 	releaseOcclusionQueryObjectNames();
 }
 
 BOOL LLOcclusionCullingGroup::needsUpdate()
 {
-	return (LLDrawable::getCurrentFrame() % mSpatialPartition->mLODPeriod == mLODHash) ? TRUE : FALSE;
+	return mSpatialPartition && (LLDrawable::getCurrentFrame() % mSpatialPartition->mLODPeriod == mLODHash) ? TRUE : FALSE;
 }
 
 BOOL LLOcclusionCullingGroup::isRecentlyVisible() const
@@ -1070,6 +1081,10 @@ U32 LLOcclusionCullingGroup::getLastOcclusionIssuedTime()
 
 void LLOcclusionCullingGroup::checkOcclusion()
 {
+	if (mSpatialPartition == nullptr)
+	{
+		return;
+	}
 	if (LLPipeline::sUseOcclusion > 1)
 	{
 		LL_RECORD_BLOCK_TIME(FTM_OCCLUSION_READBACK);
@@ -1170,6 +1185,10 @@ static LLTrace::BlockTimerStatHandle FTM_OCCLUSION_DRAW("Draw");
 
 void LLOcclusionCullingGroup::doOcclusion(LLCamera* camera, const LLVector4a* shift)
 {
+	if (mSpatialPartition == nullptr)
+	{
+		return;
+	}
 	LLGLDisable<GL_STENCIL_TEST> stencil;
 	if (mSpatialPartition->isOcclusionEnabled() && LLPipeline::sUseOcclusion > 1)
 	{
@@ -1319,6 +1338,11 @@ LLViewerOctreePartition::LLViewerOctreePartition() :
 	
 LLViewerOctreePartition::~LLViewerOctreePartition()
 {
+	llassert(mGroups.empty());
+	for (auto& entry : mGroups)
+	{
+		entry->mSpatialPartition = nullptr;
+	}
 	delete mOctree;
 	mOctree = NULL;
 }

indra/newview/llvieweroctree.h

@@ -44,6 +44,7 @@ class LLViewerOctreeEntryData;
 class LLViewerOctreeGroup;
 class LLViewerOctreeEntry;
 class LLViewerOctreePartition;
+class LLSpatialPartition;
 
 typedef LLOctreeListener<LLViewerOctreeEntry>	OctreeListener;
 	typedef LLTreeNode<LLViewerOctreeEntry>			TreeNode;
@@ -288,7 +289,7 @@ protected:
 	virtual ~LLOcclusionCullingGroup();
 
 public:
-	LLOcclusionCullingGroup(OctreeNode* node, LLViewerOctreePartition* part);
+	LLOcclusionCullingGroup(OctreeNode* node, LLSpatialPartition* part);
 	LLOcclusionCullingGroup(const LLOcclusionCullingGroup& rhs) : LLViewerOctreeGroup(rhs)
 	{
 		*this = rhs;
@@ -330,7 +331,8 @@ protected:
 
 	S32 mLODHash;
 
-	LLViewerOctreePartition* mSpatialPartition;
+	friend class LLViewerOctreePartition;
+	LLSpatialPartition* mSpatialPartition;
 	U32	mOcclusionQuery[LLViewerCamera::NUM_CAMERAS];
 
 public:
@@ -355,6 +357,7 @@ public:
 	BOOL             mOcclusionEnabled; // if TRUE, occlusion culling is performed
 	U32              mLODSeed;
 	U32              mLODPeriod;	//number of frames between LOD updates for a given spatial group (staggered by mLODSeed)
+	std::vector<LLOcclusionCullingGroup*> mGroups;
 };
 
 class LLViewerOctreeCull : public OctreeTraveler