diff options
| author | Adam Moss <moss@lindenlab.com> | 2007-02-21 11:13:06 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2007-02-21 11:13:06 +0000 |
| commit | 5bdbc85a14447c9839f300072c4a3e3146f51585 (patch) | |
| tree | d0be77722f18a315ec2237a05173bfc5bfda165d /indra/newview | |
| parent | 7dada07dbaae3dfb9b1319453e51019bfff2717f (diff) | |
merge QA'd branch fixing SL-35450 Startup crash with non-english locales (linux
client)
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58131
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35450-based-on-r58131
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llstartup.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index fc95ebd067..282de24060 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -464,12 +464,13 @@ BOOL idle_startup() #if LL_LIBXUL_ENABLED set_startup_status(0.48f, "Initializing embedded web browser...", gAgent.mMOTD.c_str()); display_startup(); + llinfos << "Initializing embedded web browser..." << llendl; #if LL_DARWIN // For Mac OS, we store both the shared libraries and the runtime files (chrome/, plugins/, etc) in // Second Life.app/Contents/MacOS/. This matches the way Firefox is distributed on the Mac. std::string profileBaseDir(gDirUtilp->getExecutableDir()); - #else + #elif LL_WINDOWS std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); profileBaseDir += gDirUtilp->getDirDelimiter(); #ifdef LL_DEBUG @@ -477,8 +478,24 @@ BOOL idle_startup() #else profileBaseDir += "mozilla"; #endif + #else + std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); + profileBaseDir += gDirUtilp->getDirDelimiter(); + profileBaseDir += "mozilla"; #endif - LLMozLib::getInstance()->init( profileBaseDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) ); + +#if LL_LINUX + // Yuck, Mozilla init plays with the locale - push/pop + // the locale to protect it, as exotic/non-C locales + // causes our code lots of general critical weirdness + // and crashness. (SL-35450) + char *saved_locale = setlocale(LC_ALL, NULL); +#endif // LL_LINUX + LLMozLib::getInstance()->init( profileBaseDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) ); +#if LL_LINUX + if (saved_locale) + setlocale(LC_ALL, saved_locale); +#endif // LL_LINUX std::ostringstream codec; codec << "[Second Life " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD << "]"; |