diff options
| author | Melanie | 2011-12-05 20:32:35 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-05 20:32:35 +0000 |
| commit | bc17e2e9cf1361116f9082326f7630b8f0c862ba (patch) | |
| tree | d0bc568f8b5eeb47ccd77c822e6941b0e150319c /OpenSim/Server/Handlers/Asset | |
| parent | Add the proper result code as per the LL announcement for llTransferLindenDol... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.zip opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.gz opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.bz2 opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to '')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs index 8014fb5..0cfe5b1 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs | |||
| @@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | public override byte[] Handle(string path, Stream request, | 59 | public override byte[] Handle(string path, Stream request, |
| 60 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 60 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 61 | { | 61 | { |
| 62 | bool result = false; | 62 | bool result = false; |
| 63 | 63 | ||
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs index 43c1693..8f7412b 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |||
| @@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | public override byte[] Handle(string path, Stream request, | 57 | public override byte[] Handle(string path, Stream request, |
| 58 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 58 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 59 | { | 59 | { |
| 60 | byte[] result = new byte[0]; | 60 | byte[] result = new byte[0]; |
| 61 | 61 | ||
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs index 1fcd3ed..87b3d2d 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs | |||
| @@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | public override byte[] Handle(string path, Stream request, | 57 | public override byte[] Handle(string path, Stream request, |
| 58 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 58 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 59 | { | 59 | { |
| 60 | XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); | 60 | XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); |
| 61 | AssetBase asset = (AssetBase) xs.Deserialize(request); | 61 | AssetBase asset = (AssetBase) xs.Deserialize(request); |