diff options
author | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 08:52:26 -0400 |
commit | a7d8b425097a7fab0a5a40d6a6b5770deb0bb7f9 (patch) | |
tree | 81e800d495674faa37d66c18db36cbfccd7fc5eb /indra/llrender/llglstates.h | |
parent | df93749819c503a66bc0ad34aeb1c7bed3746df2 (diff) | |
parent | b9e43dfd646990be236e44814ce3199de3391dc1 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/llrender/llglstates.h')
-rw-r--r-- | indra/llrender/llglstates.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llrender/llglstates.h b/indra/llrender/llglstates.h index e26aead676..0e2c3bcb44 100644 --- a/indra/llrender/llglstates.h +++ b/indra/llrender/llglstates.h @@ -59,7 +59,6 @@ protected: LLGLEnable mColorMaterial; LLGLDisable mAlphaTest, mBlend, mCullFace, mDither, mFog, mLineSmooth, mLineStipple, mNormalize, mPolygonSmooth, - mTextureGenQ, mTextureGenR, mTextureGenS, mTextureGenT, mGLMultisample; public: LLGLSDefault() @@ -76,10 +75,6 @@ public: mLineStipple(GL_LINE_STIPPLE), mNormalize(GL_NORMALIZE), mPolygonSmooth(GL_POLYGON_SMOOTH), - mTextureGenQ(GL_TEXTURE_GEN_Q), - mTextureGenR(GL_TEXTURE_GEN_R), - mTextureGenS(GL_TEXTURE_GEN_S), - mTextureGenT(GL_TEXTURE_GEN_T), mGLMultisample(GL_MULTISAMPLE_ARB) { } }; |