2 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp
index e8169b6..debf2e3 100644
--- a/linden/indra/llwindow/llgl.cpp
+++ b/linden/indra/llwindow/llgl.cpp
@@ -990,6 +990,12 @@ void LLGLState::initClass()
 {
         sStateMap[GL_DITHER] = GL_TRUE;
         sStateMap[GL_TEXTURE_2D] = GL_TRUE;
+
+        //make sure vertex arrays are enabled
+        glEnableClientState(GL_VERTEX_ARRAY);
+
+        //make sure multi sampling is disabled by default
+        glDisable(GL_MULTISAMPLE_ARB);
 }
 
 //static
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 70487b7..2001899 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -1346,9 +1346,6 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
         SetWindowLong(mWindowHandle, GWL_USERDATA, (U32)this);
         show();
 
-        //make sure multi sampling is disabled by default
-        glDisable(GL_MULTISAMPLE_ARB);
-
         //register joystick timer callback
         SetTimer( mWindowHandle, 0, 1000 / 30, NULL ); // 30 fps timer