From 5fa00a67af6364554c05eb3ca0339770fa6da455 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sat, 24 Apr 2010 20:36:42 +0100
Subject: [PATCH] DEV-39786 (SNOW-572 / SNOW-220 / VWR-14712):
GL_COLOR_INDEX8_EXT not defined as GL_EXT_paletted_texture is deprecated.
Imported from Snowglobe.
---
doc/contributions.txt | 2 ++
indra/newview/llvoavatarself.cpp | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index ef9f09bd232..743f64d0b55 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 7473adda1f7..63f060b58a4 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;
--
GitLab