diff options
| author | simon <none@none> | 2013-03-22 14:17:26 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-03-22 14:17:26 -0700 |
| commit | 1d8e3997c8ced25524f146aeb6cc683e5767a5f7 (patch) | |
| tree | 888cc32ac788bcb10dc5df4f0e0124514f4474ef /indra/llrender | |
| parent | 395f8baf03622f3a36b03b8e31679e3b594b1757 (diff) | |
| parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) | |
Pull and merge latest viewer-beta
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 58bd346c15..faed0b3a15 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -603,11 +603,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 @@ -1502,9 +1497,7 @@ void assert_glerror() void clear_glerror() { - // Create or update texture to be used with this data - GLenum error; - error = glGetError(); + glGetError(); } /////////////////////////////////////////////////////////////// |