From 7abecb48babe6a6f09bf6692ba55076546cfced9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 1 Dec 2008 17:39:58 -0600
Subject: Second Life viewer sources 1.22.0-RC

---
 linden/indra/llrender/llgl.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'linden/indra/llrender/llgl.h')

diff --git a/linden/indra/llrender/llgl.h b/linden/indra/llrender/llgl.h
index cb368d7..8433348 100644
--- a/linden/indra/llrender/llgl.h
+++ b/linden/indra/llrender/llgl.h
@@ -74,7 +74,6 @@ public:
 	BOOL mHasMultitexture;
 	S32	 mNumTextureUnits;
 	BOOL mHasMipMapGeneration;
-	BOOL mHasPalettedTextures;
 	BOOL mHasCompressedTextures;
 	BOOL mHasFramebufferObject;
 
@@ -318,11 +317,11 @@ public:
 class LLGLNamePool
 {
 public:
-	typedef struct
+	struct NameEntry
 	{
 		GLuint name;
 		BOOL used;
-	} NameEntry;
+	};
 
 	struct CompareUsed
 	{
@@ -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;
-- 
cgit v1.1


From a87e38229921b48c32187c672a942516722f1b52 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 11 Jan 2009 16:10:39 -0600
Subject: Second Life viewer sources 1.22.5-RC

---
 linden/indra/llrender/llgl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/llrender/llgl.h')

diff --git a/linden/indra/llrender/llgl.h b/linden/indra/llrender/llgl.h
index 8433348..011fd63 100644
--- a/linden/indra/llrender/llgl.h
+++ b/linden/indra/llrender/llgl.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
-- 
cgit v1.1