From b2f513caae9d3a4635cd27b133a326e4166ca07d Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 23 Jul 2012 04:02:20 +0200
Subject: [PATCH] Safer settings, EOL fix

---
 indra/newview/featuretable.txt |  4 ++--
 indra/newview/pipeline.cpp     | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 995506eab..fc9a175d9 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -63,8 +63,8 @@ RenderDeferred				1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
 WatchdogDisabled				1	1
-ShyotlRenderUseStreamVBO			1	1
-RenderFSAASamples			1	16
+ShyotlRenderUseStreamVBO			1	0
+RenderFSAASamples			1	4
 RenderMaxTextureIndex		1	16
 RenderUseFBO				1	0
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 4e2abcf0d..d5f4d1561 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4218,13 +4218,13 @@ void LLPipeline::renderDebug()
 
 	if (!hud_only && !mDebugBlips.empty())
 	{ //render debug blips
-		if (LLGLSLShader::sNoFixedFunction)
-		{
-			gUIProgram.bind();
-		}
-
-		gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep, true);
-
+		if (LLGLSLShader::sNoFixedFunction)
+		{
+			gUIProgram.bind();
+		}
+
+		gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep, true);
+
 		glPointSize(8.f);
 		LLGLDepthTest depth(GL_TRUE, GL_TRUE, GL_ALWAYS);