diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-14 14:54:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-14 14:54:45 -0400 |
| commit | 51e04f88666c03bd4589a587f5c2bbbf05463aa4 (patch) | |
| tree | 1158f464db264299c800b2562fa438b7f21d8a8d /indra/llwindow/llwindow.cpp | |
| parent | 99e97bf6aebab653e6faefb4af8c2083af29aca8 (diff) | |
| parent | e9116575bfd2238e80eaac08bceb8f797d0e933c (diff) | |
merge changes for open-209
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rwxr-xr-x | indra/llwindow/llwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 93b9d36939..a2824db70a 100755 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -72,7 +72,7 @@ S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type) } S32 result = 0; -#if LL_MESA_HEADLESS // !!! *FIX: (???) +#if LL_MESA_HEADLESS // !!! *FIX: (?) llwarns << "OSMessageBox: " << text << llendl; return OSBTN_OK; #elif LL_WINDOWS @@ -324,7 +324,7 @@ bool LLSplashScreen::isVisible() // static LLSplashScreen *LLSplashScreen::create() { -#if LL_MESA_HEADLESS || LL_SDL // !!! *FIX: (???) +#if LL_MESA_HEADLESS || LL_SDL // !!! *FIX: (?) return 0; #elif LL_WINDOWS return new LLSplashScreenWin32; |