merge

1 files changed, 22 insertions, 14 deletions

diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index 300245ebc3..93b9d36939 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -257,8 +257,6 @@ std::vector<std::string> LLWindow::getDynamicFallbackFontList()
 	return LLWindowWin32::getDynamicFallbackFontList();
 #elif LL_DARWIN
 	return LLWindowMacOSX::getDynamicFallbackFontList();
-#elif LL_MESA_HEADLESS
-	return std::vector<std::string>();
 #elif LL_SDL
 	return LLWindowSDL::getDynamicFallbackFontList();
 #else
@@ -389,28 +387,38 @@ LLWindow* LLWindowManager::createWindow(
 	BOOL fullscreen, 
 	BOOL clearBg,
 	BOOL disable_vsync,
+	BOOL use_gl,
 	BOOL ignore_pixel_depth,
 	U32 fsaa_samples)
 {
 	LLWindow* new_window;
 
+	if (use_gl)
+	{
 #if LL_MESA_HEADLESS
-	new_window = new LLWindowMesaHeadless(callbacks,
-		title, name, x, y, width, height, flags, 
-		fullscreen, clearBg, disable_vsync, ignore_pixel_depth);
+		new_window = new LLWindowMesaHeadless(callbacks,
+			title, name, x, y, width, height, flags, 
+			fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
 #elif LL_SDL
-	new_window = new LLWindowSDL(callbacks,
-		title, x, y, width, height, flags, 
-		fullscreen, clearBg, disable_vsync, ignore_pixel_depth, fsaa_samples);
+		new_window = new LLWindowSDL(callbacks,
+			title, x, y, width, height, flags, 
+			fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
 #elif LL_WINDOWS
-	new_window = new LLWindowWin32(callbacks,
-		title, name, x, y, width, height, flags, 
-		fullscreen, clearBg, disable_vsync, ignore_pixel_depth, fsaa_samples);
+		new_window = new LLWindowWin32(callbacks,
+			title, name, x, y, width, height, flags, 
+			fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
 #elif LL_DARWIN
-	new_window = new LLWindowMacOSX(callbacks,
-		title, name, x, y, width, height, flags, 
-		fullscreen, clearBg, disable_vsync, ignore_pixel_depth, fsaa_samples);
+		new_window = new LLWindowMacOSX(callbacks,
+			title, name, x, y, width, height, flags, 
+			fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
 #endif
+	}
+	else
+	{
+		new_window = new LLWindowHeadless(callbacks,
+			title, name, x, y, width, height, flags, 
+			fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
+	}
 
 	if (FALSE == new_window->isValid())
 	{