diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-04-24 18:38:17 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-04-24 18:38:17 +0000 |
| commit | 5c51ae5a7b48dfac8769e5dbdd10e79b18d90070 (patch) | |
| tree | f63729c72f69dcb7d2bd5d9aa3a58c29e0c78128 /indra/llwindow/llwindow.cpp | |
| parent | 39018947081772bf7226d757c647520c54b18fd2 (diff) | |
svn merge -r 85582:85586 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge
QAR-500 maint-viewer-5 merge
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
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 |