diff options
-rw-r--r-- | ChangeLog.txt | 12 | ||||
-rwxr-xr-x | linden/indra/llcrashlogger/llcrashlogger.cpp | 4 | ||||
-rw-r--r-- | linden/indra/llvfs/lldir.cpp | 2 | ||||
-rw-r--r-- | linden/indra/llvfs/lldir_mac.cpp | 4 | ||||
-rw-r--r-- | 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 @@ | |||
1 | 2008-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
2 | |||
3 | * linden/indra/llcrashlogger/llcrashlogger.cpp: | ||
4 | Changed app dir (for cache, etc.) to Imprudence. | ||
5 | * linden/indra/llvfs/lldir.cpp: | ||
6 | Ditto. | ||
7 | * linden/indra/llvfs/lldir_mac.cpp: | ||
8 | Ditto. | ||
9 | * linden/indra/newview/llappviewer.cpp: | ||
10 | Ditto. | ||
11 | |||
12 | |||
1 | 2008-11-18 McCabe Maxsted <hakushakukun@gmail.com> | 13 | 2008-11-18 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 14 | ||
3 | * linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml: | 15 | * 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) | |||
327 | bool LLCrashLogger::init() | 327 | bool LLCrashLogger::init() |
328 | { | 328 | { |
329 | // We assume that all the logs we're looking for reside on the current drive | 329 | // We assume that all the logs we're looking for reside on the current drive |
330 | gDirUtilp->initAppDirs("SecondLife"); | 330 | gDirUtilp->initAppDirs("Imprudence"); |
331 | 331 | ||
332 | // Default to the product name "Second Life" (this is overridden by the -name argument) | 332 | // Default to the product name "Imprudence" (this is overridden by the -name argument) |
333 | mProductName = "Imprudence"; | 333 | mProductName = "Imprudence"; |
334 | 334 | ||
335 | mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes " | 335 | 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 | |||
229 | } | 229 | } |
230 | else | 230 | else |
231 | { | 231 | { |
232 | res = getOSCacheDir() + mDirDelimiter + "SecondLife"; | 232 | res = getOSCacheDir() + mDirDelimiter + "Imprudence"; |
233 | } | 233 | } |
234 | return res; | 234 | return res; |
235 | } | 235 | } |
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() | |||
121 | CFStringRef stringRef = NULL; | 121 | CFStringRef stringRef = NULL; |
122 | OSStatus error = noErr; | 122 | OSStatus error = noErr; |
123 | FSRef fileRef; | 123 | FSRef fileRef; |
124 | CFStringRef secondLifeString = CFSTR("SecondLife"); | 124 | CFStringRef secondLifeString = CFSTR("Imprudence"); |
125 | 125 | ||
126 | mainBundleRef = CFBundleGetMainBundle(); | 126 | mainBundleRef = CFBundleGetMainBundle(); |
127 | 127 | ||
@@ -172,7 +172,7 @@ LLDir_Mac::LLDir_Mac() | |||
172 | if (error == noErr) | 172 | if (error == noErr) |
173 | { | 173 | { |
174 | FSRefToLLString(&cacheDirRef, mOSCacheDir); | 174 | FSRefToLLString(&cacheDirRef, mOSCacheDir); |
175 | (void)CFCreateDirectory(&cacheDirRef, CFSTR("SecondLife"),NULL); | 175 | (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL); |
176 | } | 176 | } |
177 | 177 | ||
178 | // mOSUserAppDir | 178 | // 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() | |||
580 | 580 | ||
581 | // Need to do this initialization before we do anything else, since anything | 581 | // Need to do this initialization before we do anything else, since anything |
582 | // that touches files should really go through the lldir API | 582 | // that touches files should really go through the lldir API |
583 | gDirUtilp->initAppDirs("SecondLife"); | 583 | gDirUtilp->initAppDirs(IMP_VIEWER_NAME); |
584 | // set skin search path to default, will be overridden later | 584 | // set skin search path to default, will be overridden later |
585 | // this allows simple skinned file lookups to work | 585 | // this allows simple skinned file lookups to work |
586 | gDirUtilp->setSkinFolder("default"); | 586 | gDirUtilp->setSkinFolder("default"); |
@@ -2688,7 +2688,7 @@ bool LLAppViewer::initCache() | |||
2688 | std::string cache_dir = gDirUtilp->getOSUserAppDir(); | 2688 | std::string cache_dir = gDirUtilp->getOSUserAppDir(); |
2689 | std::string new_cache_dir = gDirUtilp->getOSCacheDir(); | 2689 | std::string new_cache_dir = gDirUtilp->getOSCacheDir(); |
2690 | cache_dir = cache_dir + "/cache"; | 2690 | cache_dir = cache_dir + "/cache"; |
2691 | new_cache_dir = new_cache_dir + "/SecondLife"; | 2691 | new_cache_dir = new_cache_dir + "/" + gSecondLife; |
2692 | if (gDirUtilp->fileExists(cache_dir)) | 2692 | if (gDirUtilp->fileExists(cache_dir)) |
2693 | { | 2693 | { |
2694 | gDirUtilp->setCacheDir(cache_dir); | 2694 | gDirUtilp->setCacheDir(cache_dir); |