From ce0a5fe14590b8d675b885fccd5f79d7ea17a302 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Tue, 21 Aug 2007 22:17:53 +0000
Subject: 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
---
 indra/llvfs/lldir_mac.cpp | 6 +-----
 indra/llvfs/llvfs.cpp     | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'indra/llvfs')

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;
 					}
 				}
     
-- 
cgit v1.2.3