diff options
| author | Diva Canto | 2013-07-09 14:13:51 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-09 14:13:51 -0700 |
| commit | d0dfb744b206d3bd002ed72f415f177c6b04226b (patch) | |
| tree | dba29f24667d254371abb726e2842700c189dfdf /OpenSim/Server/Handlers/Asset | |
| parent | Put guards on a bunch of exception-inducing code, as seen in logs from load t... (diff) | |
| parent | BulletSim: add parameter to optionally disable vehicle linear deflection. (diff) | |
| download | opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.zip opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.gz opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.bz2 opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 986394b..941b97d 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs | |||
| @@ -70,7 +70,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 70 | m_allowedTypes = allowedTypes; | 70 | m_allowedTypes = allowedTypes; |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | public override byte[] Handle(string path, Stream request, | 73 | protected override byte[] ProcessRequest(string path, Stream request, |
| 74 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 74 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 75 | { | 75 | { |
| 76 | bool result = false; | 76 | bool result = false; |
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]; |
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs index a006fa8..8eebc61 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.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 | AssetBase asset; | 60 | AssetBase asset; |