diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Services/AssetService/XAssetService.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/AssetService/XAssetService.cs | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs index e62bcb5..a1d10ed 100644 --- a/OpenSim/Services/AssetService/XAssetService.cs +++ b/OpenSim/Services/AssetService/XAssetService.cs | |||
| @@ -194,21 +194,7 @@ namespace OpenSim.Services.AssetService | |||
| 194 | if (!UUID.TryParse(id, out assetID)) | 194 | if (!UUID.TryParse(id, out assetID)) |
| 195 | return false; | 195 | return false; |
| 196 | 196 | ||
| 197 | AssetBase asset = m_Database.GetAsset(assetID); | 197 | return m_Database.Delete(id); |
| 198 | if (asset == null) | ||
| 199 | return false; | ||
| 200 | |||
| 201 | if ((int)(asset.Flags & AssetFlags.Maptile) != 0) | ||
| 202 | { | ||
| 203 | return m_Database.Delete(id); | ||
| 204 | } | ||
| 205 | else | ||
| 206 | { | ||
| 207 | m_log.DebugFormat("[XASSET SERVICE]: Request to delete asset {0}, but flags are not Maptile", id); | ||
| 208 | } | ||
| 209 | |||
| 210 | return false; | ||
| 211 | } | 198 | } |
| 212 | } | 199 | } |
| 213 | } | 200 | } \ No newline at end of file |
| 214 | |||