DRTVWR-559 Fix for shower curtain not opening smoothly. Incidental decruft.

5 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 9d1b02cd8a..6b9c159291 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -942,7 +942,7 @@ void LLDrawable::updateTexture()
 	}
 }
 
-BOOL LLDrawable::updateGeometry(BOOL priority)
+BOOL LLDrawable::updateGeometry()
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_DRAWABLE
 
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
index 5ab1f52439..970e8c8b2a 100644
--- a/indra/newview/lldrawable.h
+++ b/indra/newview/lldrawable.h
@@ -166,7 +166,7 @@ public:
 	void updateTexture();
 	void updateMaterial();
 	virtual void updateDistance(LLCamera& camera, bool force_update);
-	BOOL updateGeometry(BOOL priority);
+	BOOL updateGeometry();
 	void updateFaceSize(S32 idx);
 		
 	void updateSpecialHoverCursor(BOOL enabled);
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 7c7b91eae8..8160785d75 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2063,7 +2063,7 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 	LLSpatialGroup* group = drawable->getSpatialGroup();
 	if (group)
 	{
-        gPipeline.markRebuild(group);
+        group->dirtyMesh();
 	}
 
 	updateRelativeXform();
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 40112421cd..715e2a2326 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2457,9 +2457,9 @@ void LLPipeline::doOcclusion(LLCamera& camera)
 	}
 }
 	
-bool LLPipeline::updateDrawableGeom(LLDrawable* drawablep, bool priority)
+bool LLPipeline::updateDrawableGeom(LLDrawable* drawablep)
 {
-	bool update_complete = drawablep->updateGeometry(priority);
+	bool update_complete = drawablep->updateGeometry();
 	if (update_complete && assertInitialized())
 	{
 		drawablep->setState(LLDrawable::BUILT);
@@ -2611,7 +2611,7 @@ void LLPipeline::updateGeom(F32 max_dtime)
 				drawablep->clearState(LLDrawable::FOR_UNLOAD);
 			}
 
-			if (updateDrawableGeom(drawablep, TRUE))
+			if (updateDrawableGeom(drawablep))
 			{
 				drawablep->clearState(LLDrawable::IN_REBUILD_Q);
 				mBuildQ1.erase(curiter);
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index d42253b8d7..ed110c7b9f 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -455,7 +455,7 @@ private:
 	void unloadShaders();
 	void addToQuickLookup( LLDrawPool* new_poolp );
 	void removeFromQuickLookup( LLDrawPool* poolp );
-	bool updateDrawableGeom(LLDrawable* drawable, bool priority);
+	bool updateDrawableGeom(LLDrawable* drawable);
 	void assertInitializedDoError();
 	bool assertInitialized() { const bool is_init = isInit(); if (!is_init) assertInitializedDoError(); return is_init; };
 	void connectRefreshCachedSettingsSafe(const std::string name);