diff options
| author | David Seikel | 2011-04-03 23:03:16 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-03 23:03:16 +1000 |
| commit | be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2 (patch) | |
| tree | 342cc5a544940b370a129dcdf93cadb2ef46f06c /linden/indra/llwindow/llwindowsdl.cpp | |
| parent | Push some of the trivial changes from the accountList branch. (diff) | |
| parent | Changed version to Experimental 2011.04.02. (diff) | |
| download | meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.zip meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.gz meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.bz2 meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.xz | |
Merge remote-tracking branch 'jacek/exp' into exp
Conflicts:
.gitignore
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/install.xml
Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
Diffstat (limited to 'linden/indra/llwindow/llwindowsdl.cpp')
| -rw-r--r-- | linden/indra/llwindow/llwindowsdl.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp index 5828da3..58090b3 100644 --- a/linden/indra/llwindow/llwindowsdl.cpp +++ b/linden/indra/llwindow/llwindowsdl.cpp | |||
| @@ -632,6 +632,15 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B | |||
| 632 | mWindow = SDL_SetVideoMode(width, height, bits, sdlflags); | 632 | mWindow = SDL_SetVideoMode(width, height, bits, sdlflags); |
| 633 | } | 633 | } |
| 634 | 634 | ||
| 635 | while (!mWindow && mFSAASamples > 0) | ||
| 636 | { | ||
| 637 | llwarns << "Window creating failed with " << mFSAASamples << "x FSAA."<<llendl; | ||
| 638 | mFSAASamples = mFSAASamples>>1; | ||
| 639 | SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, mFSAASamples ? 1 : 0); | ||
| 640 | SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, mFSAASamples); | ||
| 641 | mWindow = SDL_SetVideoMode(width, height, bits, sdlflags); | ||
| 642 | } | ||
| 643 | |||
| 635 | if (!mWindow) | 644 | if (!mWindow) |
| 636 | { | 645 | { |
| 637 | llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl; | 646 | llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl; |