diff options
| author | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
| commit | 7c4e01af677907b75694b9c4827d6f3ba56a5e19 (patch) | |
| tree | fd743d3cefc7d4e671c6a6429be50e76191bbd9c /linden/indra/llvfs | |
| parent | Don't dump callstacks at clean exit of viewer. (diff) | |
| parent | Changed version to Experimental 2010.10.17 (diff) | |
| download | meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.zip meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.gz meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.bz2 meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.xz | |
Merge branch 'weekly' of http://github.com/imprudence/imprudence into weekly
Diffstat (limited to 'linden/indra/llvfs')
| -rw-r--r-- | linden/indra/llvfs/lldir.cpp | 2 | ||||
| -rw-r--r-- | linden/indra/llvfs/lldir_mac.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp index af55593..2c3c5f7 100644 --- a/linden/indra/llvfs/lldir.cpp +++ b/linden/indra/llvfs/lldir.cpp | |||
| @@ -247,7 +247,7 @@ std::string LLDir::buildSLOSCacheDir() const | |||
| 247 | } | 247 | } |
| 248 | else | 248 | else |
| 249 | { | 249 | { |
| 250 | res = getOSCacheDir() + mDirDelimiter + "Imprudence"; | 250 | res = getOSCacheDir() + mDirDelimiter + "ImprudenceExperimental"; |
| 251 | } | 251 | } |
| 252 | return res; | 252 | return res; |
| 253 | } | 253 | } |
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp index 6d5dcf3..b2d9787 100644 --- a/linden/indra/llvfs/lldir_mac.cpp +++ b/linden/indra/llvfs/lldir_mac.cpp | |||
| @@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac() | |||
| 173 | if (error == noErr) | 173 | if (error == noErr) |
| 174 | { | 174 | { |
| 175 | FSRefToLLString(&cacheDirRef, mOSCacheDir); | 175 | FSRefToLLString(&cacheDirRef, mOSCacheDir); |
| 176 | (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL); | 176 | (void)CFCreateDirectory(&cacheDirRef, CFSTR("ImprudenceExperimental"),NULL); |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | // mOSUserAppDir | 179 | // mOSUserAppDir |