diff options
Diffstat (limited to 'OpenSim/Services/AssetService/AssetService.cs')
-rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index 4e512e7..470a4dd 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -156,6 +156,22 @@ 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); | ||
160 | UUID assetID; | ||
161 | if (!UUID.TryParse(id, out assetID)) | ||
162 | return false; | ||
163 | |||
164 | AssetBase asset = m_Database.GetAsset(assetID); | ||
165 | if (asset == null) | ||
166 | return false; | ||
167 | |||
168 | if ((int)(asset.Flags & AssetFlags.Maptile) != 0) | ||
169 | { | ||
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); | ||
174 | |||
159 | return false; | 175 | return false; |
160 | } | 176 | } |
161 | 177 | ||
@@ -181,6 +197,7 @@ namespace OpenSim.Services.AssetService | |||
181 | MainConsole.Instance.Output(String.Format("Description: {0}", asset.Description)); | 197 | MainConsole.Instance.Output(String.Format("Description: {0}", asset.Description)); |
182 | MainConsole.Instance.Output(String.Format("Type: {0}", asset.Type)); | 198 | MainConsole.Instance.Output(String.Format("Type: {0}", asset.Type)); |
183 | MainConsole.Instance.Output(String.Format("Content-type: {0}", asset.Metadata.ContentType)); | 199 | MainConsole.Instance.Output(String.Format("Content-type: {0}", asset.Metadata.ContentType)); |
200 | MainConsole.Instance.Output(String.Format("Flags: {0}", asset.Metadata.Flags.ToString())); | ||
184 | 201 | ||
185 | for (i = 0 ; i < 5 ; i++) | 202 | for (i = 0 ; i < 5 ; i++) |
186 | { | 203 | { |