diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-04-24 20:36:42 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-24 20:36:42 +0100 |
| commit | 5fa00a67af6364554c05eb3ca0339770fa6da455 (patch) | |
| tree | e8806c32bcd9c76a707928cbed131f5c97828fee | |
| parent | f35a2112eae55aeb206a1111f86e08cdcd44884b (diff) | |
DEV-39786 (SNOW-572 / SNOW-220 / VWR-14712): GL_COLOR_INDEX8_EXT not defined as GL_EXT_paletted_texture is deprecated.
Imported from Snowglobe.
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index ef9f09bd23..743f64d0b5 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -17,6 +17,7 @@ Agathos Frascati CT-317 CT-352 Aimee Trescothick + SNOW-572 VWR-3321 VWR-3336 VWR-3903 @@ -48,6 +49,7 @@ Aimee Trescothick VWR-14087 VWR-14267 VWR-14278 + VWR-14712 Alejandro Rosenthal VWR-1184 Aleric Inglewood diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 7473adda1f..63f060b58a 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2238,7 +2238,6 @@ LLGLuint LLVOAvatarSelf::getScratchTexName( LLGLenum format, S32& components, U3 { case GL_LUMINANCE: components = 1; internal_format = GL_LUMINANCE8; break; case GL_ALPHA: components = 1; internal_format = GL_ALPHA8; break; - case GL_COLOR_INDEX: components = 1; internal_format = GL_COLOR_INDEX8_EXT; break; case GL_LUMINANCE_ALPHA: components = 2; internal_format = GL_LUMINANCE8_ALPHA8; break; case GL_RGB: components = 3; internal_format = GL_RGB8; break; case GL_RGBA: components = 4; internal_format = GL_RGBA8; break; |