aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-11-02 00:02:10 +0000
committerJustin Clark-Casey (justincc)2012-11-02 00:02:10 +0000
commit462ad336dcd59dfc4325aed9e6d635aa866cd094 (patch)
tree627f81bf796e3bf8885b05a83728e59ccf0c38d4 /OpenSim/Server
parentComment out checks not to overwrite existing IAR/OAR files for now on "save i... (diff)
downloadopensim-SC_OLD-462ad336dcd59dfc4325aed9e6d635aa866cd094.zip
opensim-SC_OLD-462ad336dcd59dfc4325aed9e6d635aa866cd094.tar.gz
opensim-SC_OLD-462ad336dcd59dfc4325aed9e6d635aa866cd094.tar.bz2
opensim-SC_OLD-462ad336dcd59dfc4325aed9e6d635aa866cd094.tar.xz
Move check to allow only deletion of maptiles up to AssetServerDeleteHandler from AssetService.
This allows us to use a common check for both AssetService and XAssetService. It also allows future console commands to delete an asset. As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs17
1 files changed, 14 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
index 0cfe5b1..9a8aee6 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Server.Handlers.Asset
44{ 44{
45 public class AssetServerDeleteHandler : BaseStreamHandler 45 public class AssetServerDeleteHandler : BaseStreamHandler
46 { 46 {
47 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 private IAssetService m_AssetService; 49 private IAssetService m_AssetService;
50 protected bool m_allowDelete; 50 protected bool m_allowDelete;
@@ -65,11 +65,22 @@ namespace OpenSim.Server.Handlers.Asset
65 65
66 if (p.Length > 0 && m_allowDelete) 66 if (p.Length > 0 && m_allowDelete)
67 { 67 {
68 result = m_AssetService.Delete(p[0]); 68 string assetID = p[0];
69
70 AssetBase asset = m_AssetService.Get(assetID);
71 if (asset != null && (int)(asset.Flags & AssetFlags.Maptile) != 0)
72 {
73 result = m_AssetService.Delete(assetID);
74 }
75 else
76 {
77 m_log.DebugFormat(
78 "[ASSET SERVER DELETE HANDLER]: Request to delete asset {0}, but flags are not Maptile", assetID);
79 }
69 } 80 }
70 81
71 XmlSerializer xs = new XmlSerializer(typeof(bool)); 82 XmlSerializer xs = new XmlSerializer(typeof(bool));
72 return ServerUtils.SerializeResult(xs, result); 83 return ServerUtils.SerializeResult(xs, result);
73 } 84 }
74 } 85 }
75} 86} \ No newline at end of file