aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService/AssetService.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs17
1 files changed, 2 insertions, 15 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index b1f0f7e..e7eb6fe 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Services.AssetService
70 70
71 if (assetLoaderEnabled) 71 if (assetLoaderEnabled)
72 { 72 {
73 m_log.DebugFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); 73 m_log.DebugFormat("[ASSET SERVICE]: Loading default asset set from {0}", loaderArgs);
74 74
75 m_AssetLoader.ForEachDefaultXmlAsset( 75 m_AssetLoader.ForEachDefaultXmlAsset(
76 loaderArgs, 76 loaderArgs,
@@ -197,20 +197,7 @@ namespace OpenSim.Services.AssetService
197 if (!UUID.TryParse(id, out assetID)) 197 if (!UUID.TryParse(id, out assetID))
198 return false; 198 return false;
199 199
200 AssetBase asset = m_Database.GetAsset(assetID); 200 return m_Database.Delete(id);
201 if (asset == null)
202 return false;
203
204 if ((int)(asset.Flags & AssetFlags.Maptile) != 0)
205 {
206 return m_Database.Delete(id);
207 }
208 else
209 {
210 m_log.DebugFormat("[ASSET SERVICE]: Request to delete asset {0}, but flags are not Maptile", id);
211 }
212
213 return false;
214 } 201 }
215 } 202 }
216} \ No newline at end of file 203} \ No newline at end of file