Merge pull request #34 from holoneon/patch-1

Update AssetTransactionModule.cs

OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs

@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
         public void Initialise(IConfigSource source)
         {
-            IConfig sconfig = source.Configs["Startup"];
+            IConfig sconfig = source.Configs["Permissions"];
             if (sconfig != null)
             {
                 m_levelUpload = sconfig.GetInt("LevelUpload", 0);

OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs

@@ -994,7 +994,8 @@ namespace OpenSim.Region.CoreModules.Asset
             try
             {
                 // If the file is already cached, don't cache it, just touch it so access time is updated
-                if (!replace && File.Exists(filename))
+                bool fileExists = File.Exists(filename);
+                if (!replace && fileExists)
                 {
                     if (m_updateFileTimeOnCacheHit)
                         UpdateFileLastAccessTime(filename);
@@ -1031,7 +1032,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
                 try
                 {
-                    if(replace)
+                    if(fileExists)
                         File.Delete(filename);
                     File.Move(tempname, filename);
                 }