diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/llvfs/lldir_mac.cpp | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
Diffstat (limited to 'linden/indra/llvfs/lldir_mac.cpp')
| -rw-r--r-- | linden/indra/llvfs/lldir_mac.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |