From 06e8af59a92a1341e5ff343d49d341127d67de8c Mon Sep 17 00:00:00 2001
From: Brian McGroarty <soft@lindenlab.com>
Date: Fri, 18 Apr 2008 17:03:26 +0000
Subject: QAR-493 Linux startup crash

---
 indra/llwindow/llwindowsdl.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra')

diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 5ed6094f4a..3e39ecfa2e 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -759,6 +759,9 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
 #if LL_X11
 	init_x11clipboard();
 #endif // LL_X11
+
+	//make sure multisampling is disabled by default
+	glDisable(GL_MULTISAMPLE_ARB);
 	
 	// We need to do this here, once video is init'd
 	if (-1 == SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY,
-- 
cgit v1.2.3