From 6fa974fc64b172a7324b28d40f08f2a861d87f8d Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 8 Mar 2007 00:25:12 +0000
Subject: svn merge -r 58859:58902
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/llstartup.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llstartup.cpp')

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();
-- 
cgit v1.2.3