diff options
| author | simon <none@none> | 2014-07-07 14:49:45 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-07-07 14:49:45 -0700 |
| commit | 3e6698073cedc8b24068147cf6b7091f081ea125 (patch) | |
| tree | 59d8759c554af8a733668dae9668ca6fd92bf820 /indra/llwindow/llwindow.cpp | |
| parent | 770a0a2dea0bd503f88b35d3d440208bcd303e54 (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge viewer-release and become version 3.7.12
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 466c3baccf..5720660034 100755 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -71,7 +71,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: (?) LL_WARNS() << "OSMessageBox: " << text << LL_ENDL; return OSBTN_OK; #elif LL_WINDOWS @@ -323,7 +323,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; |