Second Life viewer sources 1.20.3

2 files changed, 41 insertions, 3 deletions

diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp
index a059cd4..229fdf2 100644
--- a/linden/indra/llwindow/llgl.cpp
+++ b/linden/indra/llwindow/llgl.cpp
@@ -1152,7 +1152,7 @@ void LLGLState::checkTextureChannels()
                         llwarns << "Texture matrix in channel " << i << " corrupt." << llendl;
                 }
 
-                for (S32 j = (i == 0 ? 2 : 0); j < 8; j++)
+                for (S32 j = (i == 0 ? 1 : 0); j < 8; j++)
                 {
                         if (glIsEnabled(value[j]))
                         {
@@ -1177,6 +1177,23 @@ void LLGLState::checkClientArrays(U32 data_mask)
 #if LL_DEBUG_GL
         stop_glerror();
         BOOL error = FALSE;
+
+        GLint active_texture;
+        glGetIntegerv(GL_CLIENT_ACTIVE_TEXTURE_ARB, &active_texture);
+
+        if (active_texture != GL_TEXTURE0_ARB)
+        {
+                llwarns << "Client active texture corrupted: " << active_texture << llendl;
+                error = TRUE;
+        }
+
+        glGetIntegerv(GL_ACTIVE_TEXTURE_ARB, &active_texture);
+        if (active_texture != GL_TEXTURE0_ARB)
+        {
+                llwarns << "Active texture corrupted: " << active_texture << llendl;
+                error = TRUE;
+        }
+
         static const char* label[] =
         {
                 "GL_VERTEX_ARRAY",
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index b14df5e..9963493 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -1326,8 +1326,9 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
                 close();
                 OSMessageBox(
                                          "Second Life is unable to run because your video card drivers\n"
-                                         "are out of date or unsupported. Please make sure you have\n"
-                                         "the latest video card drivers installed.\n\n"
+                                         "did not install properly, are out of date, or are for unsupported\n" 
+                                         "hardware. Please make sure you have the latest video card drivers\n"
+                                         "and even if you do have the latest, try reinstalling them.\n\n"
                                          "If you continue to receive this message, contact customer service.",
                                          "Error",
                                          OSMB_OK);
@@ -1836,6 +1837,10 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                         break;
                 }
                 case WM_IME_SETCONTEXT:
+                        if (gDebugWindowProc)
+                        {
+                                llinfos << "WM_IME_SETCONTEXT" << llendl;
+                        }
                         if (LLWinImm::isAvailable() && window_imp->mPreeditor)
                         {
                                 l_param &= ~ISC_SHOWUICOMPOSITIONWINDOW;
@@ -1844,6 +1849,10 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                         break;
 
                 case WM_IME_STARTCOMPOSITION:
+                        if (gDebugWindowProc)
+                        {
+                                llinfos << "WM_IME_STARTCOMPOSITION" << llendl;
+                        }
                         if (LLWinImm::isAvailable() && window_imp->mPreeditor)
                         {
                                 window_imp->handleStartCompositionMessage();
@@ -1852,6 +1861,10 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                         break;
 
                 case WM_IME_ENDCOMPOSITION:
+                        if (gDebugWindowProc)
+                        {
+                                llinfos << "WM_IME_ENDCOMPOSITION" << llendl;
+                        }
                         if (LLWinImm::isAvailable() && window_imp->mPreeditor)
                         {
                                 return 0;
@@ -1859,6 +1872,10 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                         break;
 
                 case WM_IME_COMPOSITION:
+                        if (gDebugWindowProc)
+                        {
+                                llinfos << "WM_IME_COMPOSITION" << llendl;
+                        }
                         if (LLWinImm::isAvailable() && window_imp->mPreeditor)
                         {
                                 window_imp->handleCompositionMessage(l_param);
@@ -1867,6 +1884,10 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                         break;
 
                 case WM_IME_REQUEST:
+                        if (gDebugWindowProc)
+                        {
+                                llinfos << "WM_IME_REQUEST" << llendl;
+                        }
                         if (LLWinImm::isAvailable() && window_imp->mPreeditor)
                         {
                                 LRESULT result = 0;