summaryrefslogtreecommitdiff
path: root/indra/llrender/llgl.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-04-02 15:04:41 -0700
committerdolphin <dolphin@lindenlab.com>2013-04-02 15:04:41 -0700
commitf684d897f532bcba87cda1f72bd19efac82f6cb6 (patch)
tree6222ff28ee7825e987a127383a081297a80d7e6c /indra/llrender/llgl.cpp
parent4bdecca57ec82a5dbc323432b7b5cb6aba9c1303 (diff)
parent90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff)
Merge with viewer-development
Diffstat (limited to 'indra/llrender/llgl.cpp')
-rw-r--r--indra/llrender/llgl.cpp9
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();
}
///////////////////////////////////////////////////////////////