diff options
| author | Melanie Thielker | 2015-03-10 01:03:31 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2015-03-10 01:03:31 +0100 |
| commit | cf402812b74f02ca54435c81512db541e5cf13bd (patch) | |
| tree | e743bd16a827ff4610e816a1740f0fd824b2a376 /OpenSim/Server | |
| parent | Make the maptile uploader in remote admin fire and forget so the controlling ... (diff) | |
| download | opensim-SC-cf402812b74f02ca54435c81512db541e5cf13bd.zip opensim-SC-cf402812b74f02ca54435c81512db541e5cf13bd.tar.gz opensim-SC-cf402812b74f02ca54435c81512db541e5cf13bd.tar.bz2 opensim-SC-cf402812b74f02ca54435c81512db541e5cf13bd.tar.xz | |
Fix content type checking to confirm to newer core versions
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index ce0e120..f912758 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
| @@ -233,7 +233,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 233 | Encoding encoding = Encoding.UTF8; | 233 | Encoding encoding = Encoding.UTF8; |
| 234 | 234 | ||
| 235 | Stream inputStream = null; | 235 | Stream inputStream = null; |
| 236 | if (httpRequest.ContentType == "application/x-gzip") | 236 | if ((httpRequest.ContentType == "application/x-gzip" || httpRequest.Headers["Content-Encoding"] == "gzip") || (httpRequest.Headers["X-Content-Encoding"] == "gzip")) |
| 237 | inputStream = new GZipStream(request, CompressionMode.Decompress); | 237 | inputStream = new GZipStream(request, CompressionMode.Decompress); |
| 238 | else if (httpRequest.ContentType == "application/json") | 238 | else if (httpRequest.ContentType == "application/json") |
| 239 | inputStream = request; | 239 | inputStream = request; |