diff options
| author | opensim mirror account | 2010-10-13 23:30:06 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-13 23:30:06 -0700 |
| commit | eb606559e72ef8b79d37da52d81d012a5643dda3 (patch) | |
| tree | 60c1692cc3c22781a66653faca3bf930a95548cd /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | * Partially complete stuff for Mesh support that Melanie wanted to see before... (diff) | |
| download | opensim-SC_OLD-eb606559e72ef8b79d37da52d81d012a5643dda3.zip opensim-SC_OLD-eb606559e72ef8b79d37da52d81d012a5643dda3.tar.gz opensim-SC_OLD-eb606559e72ef8b79d37da52d81d012a5643dda3.tar.bz2 opensim-SC_OLD-eb606559e72ef8b79d37da52d81d012a5643dda3.tar.xz | |
Merge branch 'master' of /var/git/opensim/
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); |