diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-26 11:19:04 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-26 11:19:04 -0500 |
| commit | da1898d1cb9a1539a897541afebe47ff6f517d30 (patch) | |
| tree | 831c7d71a22c0c735304bd477f429f3ff720f49f /indra | |
| parent | 7dafa1be79f4e3f454ce022326cb09fa5cabb003 (diff) | |
SH-2625 Fix for window size reverting to non-maximized whenever shaders are loaded.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llgl.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 381f52a37c..20ca189e7f 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -553,7 +553,7 @@ bool LLGLManager::initGL() &mDriverVersionVendorString ); mGLVersion = mDriverVersionMajor + mDriverVersionMinor * .1f; - + // Trailing space necessary to keep "nVidia Corpor_ati_on" cards // from being recognized as ATI. if (mGLVendor.substr(0,4) == "ATI ") diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 637cba6d6c..cf5327e5f3 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -584,7 +584,6 @@ void LLViewerShaderMgr::setShaders() if (gViewerWindow) { gViewerWindow->setCursor(UI_CURSOR_ARROW); - gViewerWindow->getWindow()->restore(); } gPipeline.createGLBuffers(); |