Replaced obsolete priority spatial queue lock with new group-specific variants

2011-05-20 15:51:45 -05:00
parent 77f09744ab
commit 9a29428b39
4 changed files with 30 additions and 14 deletions
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -463,7 +463,6 @@ public:
 	static BOOL				sRenderAttachedLights;
 	static BOOL				sRenderAttachedParticles;
 	static BOOL				sRenderDeferred;
-	static BOOL             sAllowRebuildPriorityGroup;
 	static S32				sVisibleLightCount;
 	static F32				sMinRenderSize;

@@ -585,6 +584,9 @@ protected:
 	LLDrawable::drawable_list_t 	mBuildQ2; // non-priority
 	LLSpatialGroup::sg_vector_t		mGroupQ1; //priority
 	LLSpatialGroup::sg_vector_t		mGroupQ2; // non-priority
+	bool mGroupQ2Locked;
+	bool mGroupQ1Locked;
+
 	LLViewerObject::vobj_list_t		mCreateQ;
 		
 	LLDrawable::drawable_set_t		mRetexturedList;