diff options
| author | Jacek Antonelli | 2008-12-06 21:00:15 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-06 21:00:15 -0600 |
| commit | e23dcb6417910fa2073d0c4492732d04324f8c8f (patch) | |
| tree | bdede6646e160d9423899fda63d71c985eb0d294 /linden/indra/llrender | |
| parent | Read filter labels from XML, no hard-coding. (diff) | |
| parent | Added banners in ChangeLog to set versions apart. (diff) | |
| download | meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.zip meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.tar.gz meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.tar.bz2 meta-impy-e23dcb6417910fa2073d0c4492732d04324f8c8f.tar.xz | |
Merge RC2 into quickfilter
Diffstat (limited to 'linden/indra/llrender')
| -rw-r--r-- | linden/indra/llrender/llgl.cpp | 2 | ||||
| -rw-r--r-- | linden/indra/llrender/llrender.h | 2 |
2 files changed, 2 insertions, 2 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"); |
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h index 15360a3..ef495ed 100644 --- a/linden/indra/llrender/llrender.h +++ b/linden/indra/llrender/llrender.h | |||
| @@ -214,7 +214,7 @@ public: | |||
| 214 | 214 | ||
| 215 | LLTexUnit* getTexUnit(U32 index); | 215 | LLTexUnit* getTexUnit(U32 index); |
| 216 | 216 | ||
| 217 | typedef struct Vertex | 217 | struct Vertex |
| 218 | { | 218 | { |
| 219 | GLfloat v[3]; | 219 | GLfloat v[3]; |
| 220 | GLubyte c[4]; | 220 | GLubyte c[4]; |