diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/llvfs | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir_mac.cpp | 6 | ||||
| -rw-r--r-- | indra/llvfs/llvfs.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index a74bbefb0c..64b66139b8 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -156,11 +156,7 @@ LLDir_Mac::LLDir_Mac() FSRefToLLString(&tempRef, mTempDir); } - // Set the working dir to <bundle>/Contents/Resources - (void) chdir(mAppRODataDir.c_str()); - - // Canonically, since we set it here... - mWorkingDir = mAppRODataDir; + mWorkingDir = getCurPath(); CFRelease(executableURLRef); executableURLRef = NULL; diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 9094bdd24f..0054e87755 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -872,11 +872,11 @@ BOOL LLVFS::setMaxSize(const LLUUID &file_id, const LLAssetType::EType file_type { llwarns << "Short write" << llendl; } - - delete[] buffer; } else { llwarns << "Short read" << llendl; } + + delete[] buffer; } } |