diff options
author | Josh Bell <josh@lindenlab.com> | 2007-03-08 00:25:12 +0000 |
---|---|---|
committer | Josh Bell <josh@lindenlab.com> | 2007-03-08 00:25:12 +0000 |
commit | 6fa974fc64b172a7324b28d40f08f2a861d87f8d (patch) | |
tree | 3ef9df7d3b66bfbdd6163bf3b88d3d2163a186bc /indra/newview/llstartup.cpp | |
parent | a00d02efef4de36138194f468465235c01b11d01 (diff) |
svn merge -r 58859:58902 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 421e836f93..e6c6576ae1 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -488,6 +488,10 @@ BOOL idle_startup() #else profileBaseDir += "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(); |