diff options
Merge branch 'master' into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||