From 5c51ae5a7b48dfac8769e5dbdd10e79b18d90070 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 24 Apr 2008 18:38:17 +0000
Subject: svn merge -r 85582:85586
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge

QAR-500 maint-viewer-5 merge
---
 indra/llwindow/llwindow.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'indra/llwindow')

diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index fd850fe258..1c1e1b6f2b 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -40,8 +40,6 @@
 #include "llwindowwin32.h"
 #elif LL_DARWIN
 #include "llwindowmacosx.h"
-#elif LL_LINUX
-#include "llwindowlinux.h" // currently just a dummy wrapper
 #endif
 
 #include "llerror.h"
@@ -464,10 +462,6 @@ LLWindow* LLWindowManager::createWindow(
 		new_window = new LLWindowMacOSX(
 			title, name, x, y, width, height, flags, 
 			fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
-#elif LL_LINUX
-		new_window = new LLWindowLinux(
-			title, name, x, y, width, height, flags, 
-			fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
 #endif
 	}
 	else
-- 
cgit v1.2.3