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);
                 }

OpenSim/Region/ScriptEngine/YEngine/XMRObjectTokens.cs

@@ -2942,7 +2942,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                     if(obj is OTOpndBinOp)
                         sb.Append(')');
                     sb.Append('.');
-                    sb.Append(field.Name);
+                    sb.Append(this.field.Name);
                     return sb.ToString();
                 }
             }
@@ -3548,9 +3548,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine
             {
                 get
                 {
-                    if(field.DeclaringType == typeof(ScriptBaseClass))
-                        return field.Name;
-                    return field.DeclaringType.Name + "." + field.Name;
+                    if(this.field.DeclaringType == typeof(ScriptBaseClass))
+                        return this.field.Name;
+                    return this.field.DeclaringType.Name + "." + this.field.Name;
                 }
             }
         }