diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-21 10:57:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-21 10:57:38 -0400 |
| commit | 50f199e45d0524b59fc9246a3160c5676c8d3942 (patch) | |
| tree | e091467d64f4334459b5ca67239ed23d4059392a /indra/llrender | |
| parent | bf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (diff) | |
| parent | 43d7c80e8e2cd1cfe4e6c4214b4a4df9341d310b (diff) | |
merge changes for 3.5.0-beta4
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 9e4857b6bc..c8cf3713ab 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -597,11 +597,6 @@ bool LLGLManager::initGL() if (mGLVendor.substr(0,4) == "ATI ") { mGLVendorShort = "ATI"; - BOOL mobile = FALSE; - if (mGLRenderer.find("MOBILITY") != std::string::npos) - { - mobile = TRUE; - } mIsATI = TRUE; #if LL_WINDOWS && !LL_MESA_HEADLESS @@ -1489,9 +1484,7 @@ void assert_glerror() void clear_glerror() { - // Create or update texture to be used with this data - GLenum error; - error = glGetError(); + glGetError(); } /////////////////////////////////////////////////////////////// |