diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/llrender/llgl.cpp | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llrender/llgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |