Second Life viewer sources 1.18.3.2-RC

2 files changed, 3 insertions, 7 deletions

diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index d257ce0..db6e20d 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -176,11 +176,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/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp
index a05d1b9..89db67b 100644
--- a/linden/indra/llvfs/llvfs.cpp
+++ b/linden/indra/llvfs/llvfs.cpp
@@ -892,11 +892,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;
                                         }
                                 }