diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:07:45 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 15:07:45 -0500 |
| commit | 89b75e75315592da9f4aac2ed851b61f1ac20851 (patch) | |
| tree | 80e8466a755f7ecc86a9a3834fc6d5777fa5fc48 /indra/llwindow | |
| parent | 22dd6acbc969f604c120a9ca06cfbef6eb8d29a4 (diff) | |
| parent | 02554b74827bdade4b8e3f23c4e7325ddd347040 (diff) | |
merge changes for vmrg-181
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 121c7880df..db5e55019b 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -1031,6 +1031,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO mhInstance, NULL); + LL_INFOS("Window") << "window is created." << llendl ; + //----------------------------------------------------------------------- // Create GL drawing context //----------------------------------------------------------------------- @@ -1120,6 +1122,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO return FALSE; } + LL_INFOS("Window") << "Drawing context is created." << llendl ; + gGLManager.initWGL(); if (wglChoosePixelFormatARB) @@ -1256,7 +1260,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO LL_INFOS("Window") << "Choosing pixel formats: " << num_formats << " pixel formats returned" << LL_ENDL; } - + LL_INFOS("Window") << "pixel formats done." << llendl ; S32 swap_method = 0; S32 cur_format = num_formats-1; @@ -1306,6 +1310,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO mhInstance, NULL); + LL_INFOS("Window") << "recreate window done." << llendl ; + if (!(mhDC = GetDC(mWindowHandle))) { close(); |