diff options
| author | Melanie | 2010-10-16 02:27:51 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-16 02:27:51 +0100 |
| commit | 455a2ba7ded01ffce92bf54cb3e11e73ae086e22 (patch) | |
| tree | 9d695e2b8108b3b626ade78c3e65b654076e2074 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | Add a setter to OldItemID so it can be deserialized (diff) | |
| parent | Adding projected light filters to prim propeties (diff) | |
| download | opensim-SC_OLD-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.zip opensim-SC_OLD-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.tar.gz opensim-SC_OLD-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.tar.bz2 opensim-SC_OLD-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 452df38..ba8c194 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -1474,7 +1474,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1474 | 1474 | ||
| 1475 | if (!(contentType.Contains("image") | 1475 | if (!(contentType.Contains("image") |
| 1476 | || contentType.Contains("x-shockwave-flash") | 1476 | || contentType.Contains("x-shockwave-flash") |
| 1477 | || contentType.Contains("application/x-oar"))) | 1477 | || contentType.Contains("application/x-oar") |
| 1478 | || contentType.Contains("application/vnd.ll.mesh"))) | ||
| 1478 | { | 1479 | { |
| 1479 | // Text | 1480 | // Text |
| 1480 | buffer = Encoding.UTF8.GetBytes(responseString); | 1481 | buffer = Encoding.UTF8.GetBytes(responseString); |