diff options
| author | Melanie | 2013-07-13 00:47:58 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-13 00:47:58 +0100 |
| commit | a53a10ad270ea02e57aca7787d0b8278989eea68 (patch) | |
| tree | 7ff1b6d170e828e8b9628ef13078b2cd0ecbd8b6 /OpenSim/Server/Handlers/Grid | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Centralize duplicated code in SceneObjectPart for subscribing to (diff) | |
| download | opensim-SC_OLD-a53a10ad270ea02e57aca7787d0b8278989eea68.zip opensim-SC_OLD-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.gz opensim-SC_OLD-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.bz2 opensim-SC_OLD-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Grid')
| -rw-r--r-- | OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index ef5f33e..89cba8a 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |||
| @@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
| 57 | m_GridService = service; | 57 | m_GridService = service; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | public override byte[] Handle(string path, Stream requestData, | 60 | protected override byte[] ProcessRequest(string path, Stream requestData, |
| 61 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 61 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 62 | { | 62 | { |
| 63 | StreamReader sr = new StreamReader(requestData); | 63 | StreamReader sr = new StreamReader(requestData); |