From 39018947081772bf7226d757c647520c54b18fd2 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 23 Apr 2008 01:04:01 +0000
Subject: QAR-488 Viewer 1.20 RC 2 merge Branch_1-20-Viewer -r 84760 : 85100 ->
 release

---
 indra/llwindow/llwindowwin32.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/llwindow')

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(
-- 
cgit v1.2.3