diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
| commit | fb793870fe95f1951d7c30ea6068e187b9dededd (patch) | |
| tree | 6d11632353ff4fb07133625ec5031b135b1e2882 /indra/llrender/llgl.h | |
| parent | d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff) | |
QAR-1142 merging 1.22 RC0-RC4 changes.
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
Diffstat (limited to 'indra/llrender/llgl.h')
| -rw-r--r-- | indra/llrender/llgl.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index bab5e5245f..96a03e63ac 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -74,7 +74,6 @@ public: BOOL mHasMultitexture; S32 mNumTextureUnits; BOOL mHasMipMapGeneration; - BOOL mHasPalettedTextures; BOOL mHasCompressedTextures; BOOL mHasFramebufferObject; @@ -370,7 +369,6 @@ void disable_cloth_weights(const S32 index); void set_vertex_weights(const S32 index, const U32 stride, const F32 *weights); void set_vertex_clothing_weights(const S32 index, const U32 stride, const LLVector4 *weights); void set_binormals(const S32 index, const U32 stride, const LLVector3 *binormals); -void set_palette(U8* palette_data); void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor_specific ); extern BOOL gClothRipple; |