diff options
| author | Melanie | 2010-02-08 15:53:20 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-08 15:53:38 +0000 |
| commit | baaf660511214e52ea4ed20b8e80ec8e1ff06a3a (patch) | |
| tree | 1e90c7a22ea3354d6bfd5d2b3f8f64f199dbd477 /OpenSim/Server | |
| parent | Added missing configs to Standalone.ini (diff) | |
| parent | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched (diff) | |
| download | opensim-SC-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.zip opensim-SC-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.gz opensim-SC-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.bz2 opensim-SC-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.xz | |
Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs index 3f33da6..f33bb90 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs | |||
| @@ -63,7 +63,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 63 | 63 | ||
| 64 | if (p.Length > 0) | 64 | if (p.Length > 0) |
| 65 | { | 65 | { |
| 66 | result = m_AssetService.Delete(p[0]); | 66 | // result = m_AssetService.Delete(p[0]); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | XmlSerializer xs = new XmlSerializer(typeof(bool)); | 69 | XmlSerializer xs = new XmlSerializer(typeof(bool)); |