diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-09-18 18:17:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-18 18:17:02 -0700 |
| commit | ecfd66fb094cf46a73c164d8a1b655489d037aec (patch) | |
| tree | 55f49b7be4afb49126e723eaea5f726e8572f9c2 | |
| parent | c5a2235e7a249c01999795f45ceb4697150dc3e1 (diff) | |
Avoid LL_ERRS when wgl_ARB_pixel_format is not supported (#2606)
secondlife/viewer#2599
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 0b6ee541c0..91437b98d1 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -1630,9 +1630,11 @@ const S32 max_format = (S32)num_formats - 1; } else { - LLError::LLUserWarningMsg::show(mCallbacks->translateString("MBVideoDrvErr")); - // mWindowHandle is 0, going to crash either way - LL_ERRS("Window") << "No wgl_ARB_pixel_format extension!" << LL_ENDL; + LL_WARNS("Window") << "No wgl_ARB_pixel_format extension!" << LL_ENDL; + // cannot proceed without wgl_ARB_pixel_format extension, shutdown same as any other gGLManager.initGL() failure + OSMessageBox(mCallbacks->translateString("MBVideoDrvErr"), mCallbacks->translateString("MBError"), OSMB_OK); + close(); + return false; } // Verify what pixel format we actually received. |