2 files changed, 8 insertions, 59 deletions

diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index ff45d94..46b0c67 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -67,25 +67,10 @@ namespace OpenSim.Server.Handlers.Asset
                 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
 
             bool allowDelete = serverConfig.GetBoolean("AllowRemoteDelete", false);
-            bool allowDeleteAllTypes = serverConfig.GetBoolean("AllowRemoteDeleteAllTypes", false);
-
-            AllowedRemoteDeleteTypes allowedRemoteDeleteTypes;
-
-            if (!allowDelete)
-            {
-                allowedRemoteDeleteTypes = AllowedRemoteDeleteTypes.None;
-            }
-            else
-            {
-                if (allowDeleteAllTypes)
-                    allowedRemoteDeleteTypes = AllowedRemoteDeleteTypes.All;
-                else
-                    allowedRemoteDeleteTypes = AllowedRemoteDeleteTypes.MapTile;
-            }
 
             server.AddStreamHandler(new AssetServerGetHandler(m_AssetService));
             server.AddStreamHandler(new AssetServerPostHandler(m_AssetService));
-            server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowedRemoteDeleteTypes));
+            server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowDelete));
 
             MainConsole.Instance.Commands.AddCommand("Assets", false,
                     "show asset",
@@ -156,9 +141,6 @@ namespace OpenSim.Server.Handlers.Asset
             }
             
             string fileName = rawAssetId;
-
-            if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, fileName))
-                return;
             
             using (FileStream fs = new FileStream(fileName, FileMode.CreateNew))
             {
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
index 986394b..0cfe5b1 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
@@ -42,32 +42,18 @@ using OpenSim.Framework.Servers.HttpServer;
 
 namespace OpenSim.Server.Handlers.Asset
 {
-    /// <summary>
-    /// Remote deletes allowed.
-    /// </summary>
-    public enum AllowedRemoteDeleteTypes
-    {
-        None,
-        MapTile,
-        All
-    }
-
     public class AssetServerDeleteHandler : BaseStreamHandler
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IAssetService m_AssetService;
+        protected bool m_allowDelete;
 
-        /// <summary>
-        /// Asset types that can be deleted remotely.
-        /// </summary>
-        private AllowedRemoteDeleteTypes m_allowedTypes;
-
-        public AssetServerDeleteHandler(IAssetService service, AllowedRemoteDeleteTypes allowedTypes) :
+        public AssetServerDeleteHandler(IAssetService service, bool allowDelete) :
                 base("DELETE", "/assets")
         {
             m_AssetService = service;
-            m_allowedTypes = allowedTypes;
+            m_allowDelete = allowDelete;
         }
 
         public override byte[] Handle(string path, Stream request,
@@ -77,32 +63,13 @@ namespace OpenSim.Server.Handlers.Asset
 
             string[] p = SplitParams(path);
 
-            if (p.Length > 0)
+            if (p.Length > 0 && m_allowDelete)
             {
-                if (m_allowedTypes != AllowedRemoteDeleteTypes.None)
-                {
-                    string assetID = p[0];
-
-                    AssetBase asset = m_AssetService.Get(assetID);
-                    if (asset != null)
-                    {
-                        if (m_allowedTypes == AllowedRemoteDeleteTypes.All
-                            || (int)(asset.Flags & AssetFlags.Maptile) != 0)
-                        {
-                            result = m_AssetService.Delete(assetID);
-                        }
-                        else
-                        {
-                            m_log.DebugFormat(
-                                "[ASSET SERVER DELETE HANDLER]: Request to delete asset {0}, but type is {1} and allowed remote delete types are {2}",
-                                assetID, (AssetFlags)asset.Flags, m_allowedTypes);
-                        }
-                    }
-                }
+                result = m_AssetService.Delete(p[0]);
             }
 
             XmlSerializer xs = new XmlSerializer(typeof(bool));
             return ServerUtils.SerializeResult(xs, result);
         }
     }
-}
\ No newline at end of file
+}