summaryrefslogtreecommitdiff
path: root/indra/llrender/llgl.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2013-03-13 21:01:50 +0000
committerDon Kjer <don@lindenlab.com>2013-03-13 21:01:50 +0000
commit9150757c8179f06058c41b967a69f95e03c3e619 (patch)
treedae8603163e590907b034cc8651db267026a13d3 /indra/llrender/llgl.cpp
parentcec50f8c142f4ff5f8358d9fa27884dd14f77eff (diff)
More fixes for gcc-4.6 breakage
Diffstat (limited to 'indra/llrender/llgl.cpp')
-rw-r--r--indra/llrender/llgl.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 9e4857b6bc..87f81e05ee 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -597,11 +597,11 @@ bool LLGLManager::initGL()
if (mGLVendor.substr(0,4) == "ATI ")
{
mGLVendorShort = "ATI";
- BOOL mobile = FALSE;
- if (mGLRenderer.find("MOBILITY") != std::string::npos)
- {
- mobile = TRUE;
- }
+ //BOOL mobile = FALSE;
+ //if (mGLRenderer.find("MOBILITY") != std::string::npos)
+ //{
+ // mobile = TRUE;
+ //}
mIsATI = TRUE;
#if LL_WINDOWS && !LL_MESA_HEADLESS
@@ -1490,8 +1490,9 @@ void assert_glerror()
void clear_glerror()
{
// Create or update texture to be used with this data
- GLenum error;
- error = glGetError();
+ //GLenum error;
+ //error = glGetError();
+ glGetError();
}
///////////////////////////////////////////////////////////////