Second Life viewer sources 1.18.3.2-RC

2 files changed, 3 insertions, 2 deletions

diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp
index 07348b7..2310684 100644
--- a/linden/indra/llwindow/llgl.cpp
+++ b/linden/indra/llwindow/llgl.cpp
@@ -589,8 +589,8 @@ void LLGLManager::initExtensions()
                 mHasMipMapGeneration = FALSE;
                 mHasPalettedTextures = FALSE;
                 mHasAnisotropic = FALSE;
-                mHasCubeMap = FALSE; // apparently fatal on Intel 915 & similar
-                mHasOcclusionQuery = FALSE; // source of many ATI system hangs
+                //mHasCubeMap = FALSE; // apparently fatal on Intel 915 & similar
+                //mHasOcclusionQuery = FALSE; // source of many ATI system hangs
                 mHasShaderObjects = FALSE;
                 mHasVertexShader = FALSE;
                 mHasFragmentShader = FALSE;
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index b38d4d1..9756e09 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -113,6 +113,7 @@ BOOL ll_try_gtk_init(void)
         if (!tried_gtk_init)
         {
                 tried_gtk_init = TRUE;
+                if (!g_thread_supported ()) g_thread_init (NULL);
                 maybe_lock_display();
                 gtk_is_good = gtk_init_check(NULL, NULL);
                 maybe_unlock_display();