3 files changed, 2 insertions, 24 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 2b3179116d..ca92cb6580 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -343,11 +343,8 @@ BOOL LLGLSLShader::link(BOOL suppress_errors)
 	return LLShaderMgr::instance()->linkProgramObject(mProgramObject, suppress_errors);
 }
 
-static LLFastTimer::DeclareTimer FTM_BIND_SHADER("Bind Shader");
-
 void LLGLSLShader::bind()
 {
-	LLFastTimer ftm(FTM_BIND_SHADER);
 	if (gGLManager.mHasShaderObjects)
 	{
 		glUseProgramObjectARB(mProgramObject);
@@ -360,11 +357,8 @@ void LLGLSLShader::bind()
 	}
 }
 
-static LLFastTimer::DeclareTimer FTM_UNBIND_SHADER("Unbind Shader");
-
 void LLGLSLShader::unbind()
 {
-	LLFastTimer ftm(FTM_UNBIND_SHADER);
 	if (gGLManager.mHasShaderObjects)
 	{
 		stop_glerror();
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 013577261c..38eda5bd2e 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -673,11 +673,8 @@ BOOL LLDrawable::updateMoveDamped()
 	return done_moving;
 }
 
-static LLFastTimer::DeclareTimer FTM_UPDATE_DISTANCE("Update Distance");
-
 void LLDrawable::updateDistance(LLCamera& camera, bool force_update)
 {
-	LLFastTimer t(FTM_UPDATE_DISTANCE);
 	if (LLViewerCamera::sCurCameraID != LLViewerCamera::CAMERA_WORLD)
 	{
 		llerrs << "WTF?" << llendl;
@@ -1310,12 +1307,8 @@ void LLSpatialBridge::setVisible(LLCamera& camera_in, std::vector<LLDrawable*>*
 	}
 }
 
-static LLFastTimer::DeclareTimer FTM_BRIDGE_DISTANCE_UPDATE("Bridge Distance");
-
 void LLSpatialBridge::updateDistance(LLCamera& camera_in, bool force_update)
 {
-	LLFastTimer t(FTM_BRIDGE_DISTANCE_UPDATE);
-
 	if (mDrawable == NULL)
 	{
 		markDead();
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1ae8bc5481..2f4314f7e5 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -510,6 +510,7 @@ void LLPipeline::destroyGL()
 }
 
 static LLFastTimer::DeclareTimer FTM_RESIZE_SCREEN_TEXTURE("Resize Screen Texture");
+
 void LLPipeline::resizeScreenTexture()
 {
 	LLFastTimer ft(FTM_RESIZE_SCREEN_TEXTURE);
@@ -1726,12 +1727,8 @@ void LLPipeline::markOccluder(LLSpatialGroup* group)
 	}
 }
 
-static LLFastTimer::DeclareTimer FTM_DO_OCCLUSION("Do Occlusion");
-
 void LLPipeline::doOcclusion(LLCamera& camera)
 {
-	LLFastTimer t(FTM_DO_OCCLUSION);
-
 	LLVertexBuffer::unbind();
 
 	if (hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCCLUSION))
@@ -1948,12 +1945,9 @@ void LLPipeline::updateGeom(F32 max_dtime)
 	updateMovedList(mMovedBridge);
 }
 
-static LLFastTimer::DeclareTimer FTM_MARK_VISIBLE("Mark Visible");
-
 void LLPipeline::markVisible(LLDrawable *drawablep, LLCamera& camera)
 {
 	LLMemType mt(LLMemType::MTYPE_PIPELINE_MARK_VISIBLE);
-	LLFastTimer t(FTM_MARK_VISIBLE);
 
 	if(!drawablep || drawablep->isDead())
 	{
@@ -4638,12 +4632,8 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
 	mLightMask = 0;
 }
 
-static LLFastTimer::DeclareTimer FTM_ENABLE_LIGHTS("Enable Lights");
-
 void LLPipeline::enableLights(U32 mask)
 {
-	LLFastTimer ftm(FTM_ENABLE_LIGHTS);
-
 	assertInitialized();
 
 	if (mLightingDetail == 0)
@@ -5497,6 +5487,7 @@ void LLPipeline::bindScreenToTexture()
 }
 
 static LLFastTimer::DeclareTimer FTM_RENDER_BLOOM("Bloom");
+
 void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
 {
 	LLMemType mt_ru(LLMemType::MTYPE_PIPELINE_RENDER_BLOOM);