diff options
| author | Melanie | 2012-08-03 16:46:11 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-03 16:46:11 +0100 |
| commit | 0c00abcce18d00ae151a7340b808ffe8d7e200ef (patch) | |
| tree | 3f19d7653c984120f16b3a2ea74ccf6b34928a2e /OpenSim/Services | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,... (diff) | |
| download | opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.zip opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.gz opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.bz2 opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/AssetService/AssetService.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Services/AssetService/XAssetService.cs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index 1427e84..96b430d 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
| @@ -194,7 +194,8 @@ namespace OpenSim.Services.AssetService | |||
| 194 | 194 | ||
| 195 | public virtual bool Delete(string id) | 195 | public virtual bool Delete(string id) |
| 196 | { | 196 | { |
| 197 | m_log.DebugFormat("[ASSET SERVICE]: Deleting asset {0}", id); | 197 | // m_log.DebugFormat("[ASSET SERVICE]: Deleting asset {0}", id); |
| 198 | |||
| 198 | UUID assetID; | 199 | UUID assetID; |
| 199 | if (!UUID.TryParse(id, out assetID)) | 200 | if (!UUID.TryParse(id, out assetID)) |
| 200 | return false; | 201 | return false; |
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs index 05eb125..e62bcb5 100644 --- a/OpenSim/Services/AssetService/XAssetService.cs +++ b/OpenSim/Services/AssetService/XAssetService.cs | |||
| @@ -188,7 +188,8 @@ namespace OpenSim.Services.AssetService | |||
| 188 | 188 | ||
| 189 | public virtual bool Delete(string id) | 189 | public virtual bool Delete(string id) |
| 190 | { | 190 | { |
| 191 | m_log.DebugFormat("[XASSET SERVICE]: Deleting asset {0}", id); | 191 | // m_log.DebugFormat("[XASSET SERVICE]: Deleting asset {0}", id); |
| 192 | |||
| 192 | UUID assetID; | 193 | UUID assetID; |
| 193 | if (!UUID.TryParse(id, out assetID)) | 194 | if (!UUID.TryParse(id, out assetID)) |
| 194 | return false; | 195 | return false; |