diff options
| author | Don Kjer <don@lindenlab.com> | 2012-12-14 01:24:32 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-12-14 01:24:32 +0000 |
| commit | f9b235adf87819a727a6d656736111b776021ffb (patch) | |
| tree | 79193c632e5c3f1e699ae4fa98dc6f77a966ae58 /indra/llwindow | |
| parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
Attempt at fixing linux shader support on ubuntu 12.04
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 39f8a36a6e..2f397c6372 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -682,12 +682,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B // fixme: actually, it's REALLY important for picking that we get at // least 8 bits each of red,green,blue. Alpha we can be a bit more // relaxed about if we have to. -#if LL_SOLARIS && defined(__sparc) -// again the __sparc required because Xsun support, 32bit are very pricey on SPARC - if(colorBits < 24) //HACK: on SPARC allow 24-bit color -#else - if (colorBits < 32) -#endif + if(colorBits < 24) { close(); setupFailure( @@ -697,9 +692,9 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B "You may also need to adjust the X11 setting in SMF. To do so use\n" " 'svccfg -s svc:/application/x11/x11-server setprop options/default_depth=24'\n" #else - "Second Life requires True Color (32-bit) to run in a window.\n" + "Second Life requires at least 24-bit color to run in a window.\n" "Please go to Control Panels -> Display -> Settings and\n" - "set the screen to 32-bit color.\n" + "set the screen to 24-bit color.\n" #endif "Alternately, if you choose to run fullscreen, Second Life\n" "will automatically adjust the screen each time it runs.", |