aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2008-11-18 19:21:09 -0600
committerJacek Antonelli2008-11-18 19:21:09 -0600
commit8b85536ecd3d7a15cdc72652084d1f7b4ce9cfe4 (patch)
tree4a4eb08b71e675bdf5665e9e0317489194b8722c
parentRemoved floater_tools.xml from silver skin. (diff)
downloadmeta-impy-8b85536ecd3d7a15cdc72652084d1f7b4ce9cfe4.zip
meta-impy-8b85536ecd3d7a15cdc72652084d1f7b4ce9cfe4.tar.gz
meta-impy-8b85536ecd3d7a15cdc72652084d1f7b4ce9cfe4.tar.bz2
meta-impy-8b85536ecd3d7a15cdc72652084d1f7b4ce9cfe4.tar.xz
Likely fix for VWR-9358 (palletized textures).
Suggested by Angus Boyd.
-rw-r--r--ChangeLog.txt7
-rw-r--r--linden/indra/llrender/llgl.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index f0a359d..97b3af0 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
12008-11-18 Jacek Antonelli <jacek.antonelli@gmail.com>
2
3 * linden/indra/llrender/llgl.cpp:
4 Likely fix for VWR-9358 (palletized textures).
5 Suggested by Angus Boyd.
6
7
12008-11-16 Jacek Antonelli <jacek.antonelli@gmail.com> 82008-11-16 Jacek Antonelli <jacek.antonelli@gmail.com>
2 9
3 * linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml: 10 * linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml:
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 843bc79..2cb7adc 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -578,7 +578,7 @@ void LLGLManager::initExtensions()
578#else // LL_MESA_HEADLESS 578#else // LL_MESA_HEADLESS
579 mHasMultitexture = glh_init_extensions("GL_ARB_multitexture"); 579 mHasMultitexture = glh_init_extensions("GL_ARB_multitexture");
580 mHasMipMapGeneration = glh_init_extensions("GL_SGIS_generate_mipmap"); 580 mHasMipMapGeneration = glh_init_extensions("GL_SGIS_generate_mipmap");
581 mHasPalettedTextures = glh_init_extension("GL_EXT_paletted_texture"); 581 mHasPalettedTextures = glh_init_extensions("GL_EXT_paletted_texture");
582 mHasSeparateSpecularColor = glh_init_extensions("GL_EXT_separate_specular_color"); 582 mHasSeparateSpecularColor = glh_init_extensions("GL_EXT_separate_specular_color");
583 mHasAnisotropic = glh_init_extensions("GL_EXT_texture_filter_anisotropic"); 583 mHasAnisotropic = glh_init_extensions("GL_EXT_texture_filter_anisotropic");
584 glh_init_extensions("GL_ARB_texture_cube_map"); 584 glh_init_extensions("GL_ARB_texture_cube_map");