diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-04-11 17:54:18 +0000 |
| commit | 0277259455c4354f81ea8a24c8ab93f27567bc6f (patch) | |
| tree | f1411dab563dcf697f794e9e8a592a6d3e5c4d2d /indra/newview/llviewerwindow.cpp | |
| parent | 568397bbcc4fca307ebc010ec7f815422b9ba80a (diff) | |
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 732568f652..f11f9fb1be 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1450,6 +1450,8 @@ LLViewerWindow::LLViewerWindow( LLFontManager::initClass(); + // Initialize OpenGL Renderer + if (!gFeatureManagerp->isFeatureAvailable("RenderVBO") || !gGLManager.mHasVertexBufferObject) { @@ -1475,16 +1477,30 @@ LLViewerWindow::LLViewerWindow( idx = LLViewerImageList::getMaxVideoRamSetting(-2); // get max recommended setting gSavedSettings.setS32("GraphicsCardMemorySetting", idx); } - + + // If we crashed while initializng GL stuff last time, disable certain features + if (gSavedSettings.getBOOL("RenderInitError")) + { + mInitAlert = "DisplaySettingsNoShaders"; + gSavedSettings.setBOOL("VertexShaderEnable", FALSE); + } + if (!gNoRender) { // // Initialize GL stuff // + // Set this flag in case we crash while initializing GL + gSavedSettings.setBOOL("RenderInitError", TRUE); + gSavedSettings.saveToFile( gSettingsFileName, TRUE ); + gPipeline.init(); stop_glerror(); initGLDefaults(); + + gSavedSettings.setBOOL("RenderInitError", FALSE); + gSavedSettings.saveToFile( gSettingsFileName, TRUE ); } // @@ -1531,6 +1547,7 @@ LLViewerWindow::LLViewerWindow( gSavedSettings.getControl("NumpadControl")->firePropertyChanged(); mDebugText = new LLDebugText(this); + } void LLViewerWindow::initGLDefaults() |