aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService/AssetService.cs
diff options
context:
space:
mode:
authorMelanie2010-05-10 04:05:04 +0100
committerMelanie2010-05-10 04:05:04 +0100
commitfada4cb6c483c34a286792a92eeab1bd289dd76c (patch)
tree55d97abbdee19360d3fc8a0546e4315d4a0f096d /OpenSim/Services/AssetService/AssetService.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentReturn agents when angle is PI (diff)
downloadopensim-SC_OLD-fada4cb6c483c34a286792a92eeab1bd289dd76c.zip
opensim-SC_OLD-fada4cb6c483c34a286792a92eeab1bd289dd76c.tar.gz
opensim-SC_OLD-fada4cb6c483c34a286792a92eeab1bd289dd76c.tar.bz2
opensim-SC_OLD-fada4cb6c483c34a286792a92eeab1bd289dd76c.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
-rw-r--r--OpenSim/Services/AssetService/AssetService.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index 4fc38f3..470a4dd 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Services.AssetService
156 156
157 public bool Delete(string id) 157 public bool Delete(string id)
158 { 158 {
159 m_log.DebugFormat("[ASSET SERVICE]: Deleting asset {0}", id);
159 UUID assetID; 160 UUID assetID;
160 if (!UUID.TryParse(id, out assetID)) 161 if (!UUID.TryParse(id, out assetID))
161 return false; 162 return false;
@@ -165,7 +166,11 @@ namespace OpenSim.Services.AssetService
165 return false; 166 return false;
166 167
167 if ((int)(asset.Flags & AssetFlags.Maptile) != 0) 168 if ((int)(asset.Flags & AssetFlags.Maptile) != 0)
169 {
168 return m_Database.Delete(id); 170 return m_Database.Delete(id);
171 }
172 else
173 m_log.DebugFormat("[ASSET SERVICE]: Request to delete asset {0}, but flags are not Maptile", id);
169 174
170 return false; 175 return false;
171 } 176 }