diff options
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 757bb4bae4..5e981b8922 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -485,23 +485,23 @@ BOOL idle_startup() #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()); + std::string componentDir(gDirUtilp->getExecutableDir()); #elif LL_WINDOWS - std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); - profileBaseDir += gDirUtilp->getDirDelimiter(); + std::string componentDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); + componentDir += gDirUtilp->getDirDelimiter(); #ifdef LL_DEBUG - profileBaseDir += "mozilla_debug"; + componentDir += "mozilla_debug"; #else - profileBaseDir += "mozilla"; + componentDir += "mozilla"; #endif - #elif LL_LINUX - std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); - profileBaseDir += gDirUtilp->getDirDelimiter(); - profileBaseDir += "mozilla-runtime-linux-i686"; - #else - std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); - profileBaseDir += gDirUtilp->getDirDelimiter(); - profileBaseDir += "mozilla"; + #elif LL_LINUX + std::string componentDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); + componentDir += gDirUtilp->getDirDelimiter(); + componentDir += "mozilla-runtime-linux-i686"; + #else + std::string componentDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); + componentDir += gDirUtilp->getDirDelimiter(); + componentDir += "mozilla"; #endif #if LL_LINUX @@ -511,7 +511,10 @@ BOOL idle_startup() // and crashness. (SL-35450) std::string saved_locale = setlocale(LC_ALL, NULL); #endif // LL_LINUX - LLMozLib::getInstance()->init( profileBaseDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) ); + + // initialize Mozilla - pass in executable dir, location of extra dirs (chrome/, greprefs/, plugins/ etc.) and path to profile dir) + LLMozLib::getInstance()->init( gDirUtilp->getExecutableDir(), componentDir, gDirUtilp->getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) ); + #if LL_LINUX setlocale(LC_ALL, saved_locale.c_str() ); #endif // LL_LINUX |