diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 11:39:21 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-03-18 11:39:21 -0400 |
| commit | 605a99010fb534868e4c0abef1da09c8bcfbb884 (patch) | |
| tree | 77369edeba6a0e29fce278173b0ba0322f2d965b /indra/llrender/llgl.cpp | |
| parent | dd1f89d3a9316a8486460f7f354d54083c8ca688 (diff) | |
| parent | 34181d1566d91c8e5d659db0f64d6989c824fa1f (diff) | |
merge
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 15 |
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(); } /////////////////////////////////////////////////////////////// |