1 files changed, 7 insertions, 146 deletions

diff --git a/indra/llrender/llglstates.h b/indra/llrender/llglstates.h
index 753c9a984f..bef8556348 100644
--- a/indra/llrender/llglstates.h
+++ b/indra/llrender/llglstates.h
@@ -56,139 +56,44 @@ private:
 class LLGLSDefault
 {
 protected:
-#if GL_VERSION_1_1
-	LLGLEnable mColorMaterial;
-#endif
-	LLGLDisable
-#if GL_VERSION_1_1
-		mAlphaTest,
-#endif
-		mBlend, mCullFace, mDither
-#if GL_VERSION_1_1
-		, mFog,
-		mLineSmooth, mLineStipple, mNormalize, mPolygonSmooth
-#if GL_VERSION_1_3
-		,
-		mGLMultisample
-#endif // GL_VERSION_1_3
-#endif // GL_VERSION_1_1
-			;
+    LLGLDisable mBlend, mCullFace;
 public:
 	LLGLSDefault()
 		:
-		// Enable
-#if GL_VERSION_1_1
-		mColorMaterial(GL_COLOR_MATERIAL),
 		// Disable
-		mAlphaTest(GL_ALPHA_TEST),
-#endif
 		mBlend(GL_BLEND), 
-		mCullFace(GL_CULL_FACE),
-		mDither(GL_DITHER)
-#if GL_VERSION_1_1
-		,
-		mFog(GL_FOG), 
-		mLineSmooth(GL_LINE_SMOOTH),
-		mLineStipple(GL_LINE_STIPPLE),
-		mNormalize(GL_NORMALIZE),
-		mPolygonSmooth(GL_POLYGON_SMOOTH)
-#if GL_VERSION_1_3
-		,
-		mGLMultisample(GL_MULTISAMPLE)
-#endif // GL_VERSION_1_3
-#endif // GL_VERSION_1_1
+		mCullFace(GL_CULL_FACE)
 	{ }
 };
 
 class LLGLSObjectSelect
 { 
 protected:
-	LLGLDisable mBlend
-#if GL_VERSION_1_1
-		, mFog, mAlphaTest
-#endif
-		;
+	LLGLDisable mBlend;
 	LLGLEnable mCullFace;
 public:
 	LLGLSObjectSelect()
-		: mBlend(GL_BLEND),
-#if GL_VERSION_1_1
-		  mFog(GL_FOG),
-		  mAlphaTest(GL_ALPHA_TEST),
-#endif
+		: mBlend(GL_BLEND), 
 		  mCullFace(GL_CULL_FACE)
 	{ }
 };
 
-#if GL_VERSION_1_1
-class LLGLSObjectSelectAlpha
-{
-protected:
-	LLGLEnable mAlphaTest;
-public:
-	LLGLSObjectSelectAlpha()
-		: mAlphaTest(GL_ALPHA_TEST)
-	{}
-};
-#endif
-
 //----------------------------------------------------------------------------
 
 class LLGLSUIDefault
 { 
 protected:
-	LLGLEnable mBlend
-#if GL_VERSION_1_1
-		, mAlphaTest
-#endif
-		;
+	LLGLEnable mBlend;
 	LLGLDisable mCullFace;
 	LLGLDepthTest mDepthTest;
 public:
 	LLGLSUIDefault() 
 		: mBlend(GL_BLEND),
-#if GL_VERSION_1_1
-		  mAlphaTest(GL_ALPHA_TEST),
-#endif
 		  mCullFace(GL_CULL_FACE),
 		  mDepthTest(GL_FALSE, GL_TRUE, GL_LEQUAL)
 	{}
 };
 
-#if GL_VERSION_1_1
-class LLGLSNoAlphaTest // : public LLGLSUIDefault
-{
-protected:
-	LLGLDisable mAlphaTest;
-public:
-	LLGLSNoAlphaTest()
-		: mAlphaTest(GL_ALPHA_TEST)
-	{}
-};
-
-//----------------------------------------------------------------------------
-
-class LLGLSFog
-{
-protected:
-	LLGLEnable mFog;
-public:
-	LLGLSFog()
-		: mFog(GL_FOG)
-	{}
-};
-
-class LLGLSNoFog
-{
-protected:
-	LLGLDisable mFog;
-public:
-	LLGLSNoFog()
-		: mFog(GL_FOG)
-	{}
-};
-#endif
-
 //----------------------------------------------------------------------------
 
 class LLGLSPipeline
@@ -206,33 +111,13 @@ public:
 class LLGLSPipelineAlpha // : public LLGLSPipeline
 { 
 protected:
-	LLGLEnable mBlend
-#if GL_VERSION_1_1
-		, mAlphaTest
-#endif
-		;
+	LLGLEnable mBlend;
 public:
 	LLGLSPipelineAlpha()
 		: mBlend(GL_BLEND)
-#if GL_VERSION_1_1
-		  ,
-		  mAlphaTest(GL_ALPHA_TEST)
-#endif
 	{ }
 };
 
-#if GL_VERSION_1_1
-class LLGLSPipelineEmbossBump
-{
-protected:
-	LLGLDisable mFog;
-public:
-	LLGLSPipelineEmbossBump()
-		: mFog(GL_FOG)
-	{ }
-};
-#endif
-
 class LLGLSPipelineSelection
 { 
 protected:
@@ -243,24 +128,9 @@ public:
 	{}
 };
 
-#if GL_VERSION_1_1
-class LLGLSPipelineAvatar
-{
-protected:
-	LLGLEnable mNormalize;
-public:
-	LLGLSPipelineAvatar()
-		: mNormalize(GL_NORMALIZE)
-	{}
-};
-#endif
-
 class LLGLSPipelineSkyBox
 { 
 protected:
-#if GL_VERSION_1_1
-	LLGLDisable mAlphaTest;
-#endif
     LLGLDisable mCullFace;
     LLGLSquashToFarClip mSquashClip;
 public:
@@ -286,20 +156,11 @@ public:
 class LLGLSTracker
 {
 protected:
-	LLGLEnable mCullFace, mBlend
-#if GL_VERSION_1_1
-		, mAlphaTest
-#endif
-		;
+	LLGLEnable mCullFace, mBlend;
 public:
 	LLGLSTracker() :
 		mCullFace(GL_CULL_FACE),
 		mBlend(GL_BLEND)
-#if GL_VERSION_1_1
-		,
-		mAlphaTest(GL_ALPHA_TEST)
-#endif
-		
 	{ }
 };