QAR-650 - Viewer RC 9 merge -> release (post cmake)

merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index 7e1175a000..6ea22c2f66 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -127,6 +127,7 @@ class LLSpatialGroup : public LLOctreeListener<LLDrawable>
 	friend class LLSpatialPartition;
 public:
 	static U32 sNodeCount;
+	static BOOL sNoDelete; //deletion of spatial groups and draw info not allowed if TRUE
 
 	typedef std::vector<LLPointer<LLSpatialGroup> > sg_vector_t;
 	typedef std::set<LLPointer<LLSpatialGroup> > sg_set_t;
@@ -421,7 +422,7 @@ public:
 	void pushDrawable(LLDrawable* drawable);
 	void pushBridge(LLSpatialBridge* bridge);
 	void pushDrawInfo(U32 type, LLDrawInfo* draw_info);
-
+	
 	U32 getVisibleGroupsSize()		{ return mVisibleGroupsSize; }
 	U32	getAlphaGroupsSize()		{ return mAlphaGroupsSize; }
 	U32	getDrawableGroupsSize()		{ return mDrawableGroupsSize; }
@@ -429,6 +430,8 @@ public:
 	U32	getVisibleBridgeSize()		{ return mVisibleBridgeSize; }
 	U32	getRenderMapSize(U32 type)	{ return mRenderMapSize[type]; }
 
+	void assertDrawMapsEmpty();
+
 private:
 	U32					mVisibleGroupsSize;
 	U32					mAlphaGroupsSize;