From 6717a2be0c720ffb349ad3ae6eb0aab5020d4b3d Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 18 Nov 2008 21:26:23 -0600 Subject: Changed app dir (for cache, etc.) to Imprudence. --- ChangeLog.txt | 12 ++++++++++++ linden/indra/llcrashlogger/llcrashlogger.cpp | 4 ++-- linden/indra/llvfs/lldir.cpp | 2 +- linden/indra/llvfs/lldir_mac.cpp | 4 ++-- linden/indra/newview/llappviewer.cpp | 4 ++-- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 9449172..2e090b4 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,15 @@ +2008-11-18 Jacek Antonelli + + * linden/indra/llcrashlogger/llcrashlogger.cpp: + Changed app dir (for cache, etc.) to Imprudence. + * linden/indra/llvfs/lldir.cpp: + Ditto. + * linden/indra/llvfs/lldir_mac.cpp: + Ditto. + * linden/indra/newview/llappviewer.cpp: + Ditto. + + 2008-11-18 McCabe Maxsted * linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml: diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp index b9a182c..2fffc7f 100755 --- a/linden/indra/llcrashlogger/llcrashlogger.cpp +++ b/linden/indra/llcrashlogger/llcrashlogger.cpp @@ -327,9 +327,9 @@ void LLCrashLogger::updateApplication(const std::string& message) bool LLCrashLogger::init() { // We assume that all the logs we're looking for reside on the current drive - gDirUtilp->initAppDirs("SecondLife"); + gDirUtilp->initAppDirs("Imprudence"); - // Default to the product name "Second Life" (this is overridden by the -name argument) + // Default to the product name "Imprudence" (this is overridden by the -name argument) mProductName = "Imprudence"; mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes " diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp index 0e014d9..8cd2b5c 100644 --- a/linden/indra/llvfs/lldir.cpp +++ b/linden/indra/llvfs/lldir.cpp @@ -229,7 +229,7 @@ const std::string LLDir::getCacheDir(bool get_default) const } else { - res = getOSCacheDir() + mDirDelimiter + "SecondLife"; + res = getOSCacheDir() + mDirDelimiter + "Imprudence"; } return res; } diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp index fd8f087..548f3da 100644 --- a/linden/indra/llvfs/lldir_mac.cpp +++ b/linden/indra/llvfs/lldir_mac.cpp @@ -121,7 +121,7 @@ LLDir_Mac::LLDir_Mac() CFStringRef stringRef = NULL; OSStatus error = noErr; FSRef fileRef; - CFStringRef secondLifeString = CFSTR("SecondLife"); + CFStringRef secondLifeString = CFSTR("Imprudence"); mainBundleRef = CFBundleGetMainBundle(); @@ -172,7 +172,7 @@ LLDir_Mac::LLDir_Mac() if (error == noErr) { FSRefToLLString(&cacheDirRef, mOSCacheDir); - (void)CFCreateDirectory(&cacheDirRef, CFSTR("SecondLife"),NULL); + (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL); } // mOSUserAppDir diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 5fd5575..6301421 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -580,7 +580,7 @@ bool LLAppViewer::init() // Need to do this initialization before we do anything else, since anything // that touches files should really go through the lldir API - gDirUtilp->initAppDirs("SecondLife"); + gDirUtilp->initAppDirs(IMP_VIEWER_NAME); // set skin search path to default, will be overridden later // this allows simple skinned file lookups to work gDirUtilp->setSkinFolder("default"); @@ -2688,7 +2688,7 @@ bool LLAppViewer::initCache() std::string cache_dir = gDirUtilp->getOSUserAppDir(); std::string new_cache_dir = gDirUtilp->getOSCacheDir(); cache_dir = cache_dir + "/cache"; - new_cache_dir = new_cache_dir + "/SecondLife"; + new_cache_dir = new_cache_dir + "/" + gSecondLife; if (gDirUtilp->fileExists(cache_dir)) { gDirUtilp->setCacheDir(cache_dir); -- cgit v1.1