diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
| commit | db11a76d519ebb076ec0b72284993d7f6c15f383 (patch) | |
| tree | 2fa7986e0e0ba9a39b2d2d3722ce1769ce6c2684 /indra/llwindow | |
| parent | 3c05ebd28635e867f9726062b08cdbf4a7b53b22 (diff) | |
| parent | fb8ba15801f0620699fecdf2ed08668df0be7210 (diff) | |
Merge from viewer-development post 2.4 release
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llkeyboard.h | 2 | ||||
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 22 |
2 files changed, 22 insertions, 2 deletions
diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h index be16f31abc..ba472cfde5 100644 --- a/indra/llwindow/llkeyboard.h +++ b/indra/llwindow/llkeyboard.h @@ -40,7 +40,7 @@ enum EKeystate KEYSTATE_UP }; -typedef void (*LLKeyFunc)(EKeystate keystate); +typedef boost::function<void(EKeystate keystate)> LLKeyFunc; typedef std::string (LLKeyStringTranslatorFunc)(const char *label); enum EKeyboardInsertMode diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 87075c7318..ab089081e6 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -544,7 +544,27 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks, if (closest_refresh == 0) { LL_WARNS("Window") << "Couldn't find display mode " << width << " by " << height << " at " << BITS_PER_PIXEL << " bits per pixel" << LL_ENDL; - success = FALSE; + //success = FALSE; + + if (!EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dev_mode)) + { + success = FALSE; + } + else + { + if (dev_mode.dmBitsPerPel == BITS_PER_PIXEL) + { + LL_WARNS("Window") << "Current BBP is OK falling back to that" << LL_ENDL; + window_rect.right=width=dev_mode.dmPelsWidth; + window_rect.bottom=height=dev_mode.dmPelsHeight; + success = TRUE; + } + else + { + LL_WARNS("Window") << "Current BBP is BAD" << LL_ENDL; + success = FALSE; + } + } } // If we found a good resolution, use it. |