diff options
author | Melanie | 2010-05-10 03:57:44 +0100 |
---|---|---|
committer | Melanie | 2010-05-10 03:57:44 +0100 |
commit | 3e8ceb350972a1d00c4163fecd8172602cdcd865 (patch) | |
tree | 9a23412c280440ff1762999c2d93fdd2685d0196 /OpenSim/Services/AssetService | |
parent | Fix a null ref on region crossing (diff) | |
parent | OK, this really fixes it, I promise. (diff) | |
download | opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.zip opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.gz opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.bz2 opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services/AssetService')
-rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 5 |
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 | } |