aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/GL
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/llwindow/GL
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-next.zip
meta-impy-next.tar.gz
meta-impy-next.tar.bz2
meta-impy-next.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to 'linden/indra/llwindow/GL')
-rw-r--r--linden/indra/llwindow/GL/glh_extensions.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llwindow/GL/glh_extensions.h b/linden/indra/llwindow/GL/glh_extensions.h
index 5b149c9..ce2865b 100644
--- a/linden/indra/llwindow/GL/glh_extensions.h
+++ b/linden/indra/llwindow/GL/glh_extensions.h
@@ -111,7 +111,9 @@ static const char* EatNonWhiteSpace(const char *str)
111int glh_init_extensions(const char *origReqExts) 111int glh_init_extensions(const char *origReqExts)
112{ 112{
113 // Length of requested extensions string 113 // Length of requested extensions string
114 /*
114 unsigned reqExtsLen; 115 unsigned reqExtsLen;
116 */
115 char *reqExts; 117 char *reqExts;
116 // Ptr for individual extensions within reqExts 118 // Ptr for individual extensions within reqExts
117 char *reqExt; 119 char *reqExt;
@@ -153,8 +155,8 @@ int glh_init_extensions(const char *origReqExts)
153 return TRUE; 155 return TRUE;
154 } 156 }
155 reqExts = strdup(origReqExts); 157 reqExts = strdup(origReqExts);
156 reqExtsLen = (S32)strlen(reqExts);
157 /* 158 /*
159 reqExtsLen = (S32)strlen(reqExts);
158 if (NULL == gGLHExts.mUnsupportedExts) 160 if (NULL == gGLHExts.mUnsupportedExts)
159 { 161 {
160 gGLHExts.mUnsupportedExts = (char*)malloc(reqExtsLen + 1); 162 gGLHExts.mUnsupportedExts = (char*)malloc(reqExtsLen + 1);