aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprefsim.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-30 15:58:47 -0700
committerMcCabe Maxsted2010-08-30 15:58:47 -0700
commitcc4e1096e8b264c962be3e0be0bdeb8bd61d660f (patch)
treea00b9da7ae9b94befd1ab874c6b100bb5aba6727 /linden/indra/newview/llprefsim.cpp
parentMoved LLInventoryPanel::buildNewViews called with objectp->mType behind LL_DE... (diff)
downloadmeta-impy-cc4e1096e8b264c962be3e0be0bdeb8bd61d660f.zip
meta-impy-cc4e1096e8b264c962be3e0be0bdeb8bd61d660f.tar.gz
meta-impy-cc4e1096e8b264c962be3e0be0bdeb8bd61d660f.tar.bz2
meta-impy-cc4e1096e8b264c962be3e0be0bdeb8bd61d660f.tar.xz
Added debug setting UseLegacyChatLogsFolder for saving chat.txt and IM logs in non-grid-specific folders
Diffstat (limited to 'linden/indra/newview/llprefsim.cpp')
-rw-r--r--linden/indra/newview/llprefsim.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 045139c..e7c39e2 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -190,8 +190,16 @@ void LLPrefsIMImpl::apply()
190 190
191 gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath")); 191 gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));
192 192
193 gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(), gSavedSettings.getString("FirstName"), 193 if (gSavedSettings.getBOOL("UseLegacyChatLogsFolder"))
194 gSavedSettings.getString("LastName") ); 194 {
195 gDirUtilp->setPerAccountChatLogsDir(LLStringUtil::null,
196 gSavedSettings.getString("FirstName"), gSavedSettings.getString("LastName") );
197 }
198 else
199 {
200 gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(),
201 gSavedSettings.getString("FirstName"), gSavedSettings.getString("LastName") );
202 }
195 LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir()); 203 LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
196 204
197 bool new_im_via_email = childGetValue("send_im_to_email").asBoolean(); 205 bool new_im_via_email = childGetValue("send_im_to_email").asBoolean();