aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/llrender/llrender.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 97b3af0..ea45401 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12008-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> 12008-11-18 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/llrender/llrender.h:
4 Fix VWR-9507: bad typedef breaks build on gcc 4.3.
5 Suggested by Alissa Sabre.
6
7
3 * linden/indra/llrender/llgl.cpp: 8 * linden/indra/llrender/llgl.cpp:
4 Likely fix for VWR-9358 (palletized textures). 9 Likely fix for VWR-9358 (palletized textures).
5 Suggested by Angus Boyd. 10 Suggested by Angus Boyd.
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];