diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-22 10:51:16 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-22 10:51:16 -0400 |
| commit | 61726237888b72de5bc49444adfeb931330fa929 (patch) | |
| tree | 28abb6abb7f04e532a5085ccbdc346819c2fcd97 /indra/llrender | |
| parent | ed7785bf97a601448ba2da5fb2f19ea2861454c5 (diff) | |
| parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) | |
merge changes for 3.5.0-beta5
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(); } /////////////////////////////////////////////////////////////// |