diff options
| author | Jonathan Freedman | 2010-10-17 18:45:25 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-17 18:45:25 -0400 |
| commit | 4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65 (patch) | |
| tree | 79142f2364b658f52b63e3ae688a5521290e2a4f /OpenSim/Framework/Servers/HttpServer | |
| parent | * more url / hg cleanup (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.zip opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.gz opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.bz2 opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -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 54e4a46..47e86ad 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); |