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/Framework/Servers/HttpServer/RestStreamHandler.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Centralize duplicated code in SceneObjectPart for subscribing to (diff) | |
| download | opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.zip opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.gz opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.bz2 opensim-SC-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 '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs index 1f17fee..0305dee 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs | |||
| @@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 48 | m_restMethod = restMethod; | 48 | m_restMethod = restMethod; |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 51 | protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 52 | { | 52 | { |
| 53 | Encoding encoding = Encoding.UTF8; | 53 | Encoding encoding = Encoding.UTF8; |
| 54 | StreamReader streamReader = new StreamReader(request, encoding); | 54 | StreamReader streamReader = new StreamReader(request, encoding); |