diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
| commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
| tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/llwindow/llwindowmesaheadless.cpp | |
| parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) | |
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
Diffstat (limited to 'indra/llwindow/llwindowmesaheadless.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmesaheadless.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llwindow/llwindowmesaheadless.cpp b/indra/llwindow/llwindowmesaheadless.cpp index f32ca01888..b24d3b91f8 100644 --- a/indra/llwindow/llwindowmesaheadless.cpp +++ b/indra/llwindow/llwindowmesaheadless.cpp @@ -29,14 +29,11 @@ * $/LicenseInfo$ */ -#if LL_MESA_HEADLESS - #include "linden_common.h" #include "indra_constants.h" #include "llwindowmesaheadless.h" #include "llgl.h" -#include "llglheaders.h" #define MESA_CHANNEL_TYPE GL_UNSIGNED_SHORT #define MESA_CHANNEL_SIZE 2 @@ -46,7 +43,7 @@ U16 *gMesaBuffer = NULL; // // LLWindowMesaHeadless // -LLWindowMesaHeadless::LLWindowMesaHeadless(char *title, char *name, S32 x, S32 y, S32 width, S32 height, +LLWindowMesaHeadless::LLWindowMesaHeadless(const char *title, const char *name, S32 x, S32 y, S32 width, S32 height, U32 flags, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth) : LLWindow(fullscreen, flags) @@ -83,5 +80,3 @@ void LLWindowMesaHeadless::swapBuffers() { glFinish(); } - -#endif |