diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-23 01:04:01 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-23 01:04:01 +0000 |
| commit | 39018947081772bf7226d757c647520c54b18fd2 (patch) | |
| tree | 74b00b3006878d7e576b84cb3240d98c22d67db9 /indra/llwindow/llwindowwin32.cpp | |
| parent | c01edec021194bacb86dc9a3f5a3cc655a8cb15f (diff) | |
QAR-488 Viewer 1.20 RC 2
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 0a40fb8a95..e6e999bac4 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -1277,7 +1277,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO << " Depth Bits " << S32(pfd.cDepthBits) << llendl; - if (pfd.cColorBits < 32) + // make sure we have 32 bits per pixel + if (pfd.cColorBits < 32 || GetDeviceCaps(mhDC, BITSPIXEL) < 32) { close(); OSMessageBox( |