diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs')
| -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 8f7412b..8b23a83 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |||
| @@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 54 | m_AssetService = service; | 54 | m_AssetService = service; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | public override byte[] Handle(string path, Stream request, | 57 | protected override byte[] ProcessRequest(string path, Stream request, |
| 58 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 58 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 59 | { | 59 | { |
| 60 | byte[] result = new byte[0]; | 60 | byte[] result = new byte[0]; |