diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-28 01:50:28 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-28 01:50:28 -0500 |
| commit | 4328b30180bd057412de2085c1d758f5e6906d70 (patch) | |
| tree | 79c551bfb04e46b34f671a1150a62222b3360937 | |
| parent | 6dfcb11000f349e24dbd1a9b78efa2ca4f799379 (diff) | |
SH-2450 Potential fix for crash on login with 460M et al
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 94b7451f0e..6af9e464df 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -32,6 +32,7 @@ #include "llfile.h" #include "llviewerwindow.h" +#include "llwindow.h" #include "llviewercontrol.h" #include "pipeline.h" #include "llworld.h" @@ -491,6 +492,9 @@ void LLViewerShaderMgr::setShaders() if (gViewerWindow) { gViewerWindow->setCursor(UI_CURSOR_WAIT); + //VICIOUS HACK -- some drivers will time out if we don't redraw the window within 2 seconds, and this operation can take awhile + //minimizing tells the driver we won't be updating the window for a bit + gViewerWindow->getWindow()->minimize(); } // Lighting @@ -684,6 +688,7 @@ void LLViewerShaderMgr::setShaders() if (gViewerWindow) { gViewerWindow->setCursor(UI_CURSOR_ARROW); + gViewerWindow->getWindow()->restore(); } gPipeline.createGLBuffers(); |