diff options
| author | Teravus Ovares (Dan Olivares) | 2010-10-14 02:19:42 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2010-10-14 02:19:42 -0400 |
| commit | 3384f643ebbc377ecbaae885941a08484bf259f5 (patch) | |
| tree | 60c1692cc3c22781a66653faca3bf930a95548cd /OpenSim/Framework | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-3384f643ebbc377ecbaae885941a08484bf259f5.zip opensim-SC_OLD-3384f643ebbc377ecbaae885941a08484bf259f5.tar.gz opensim-SC_OLD-3384f643ebbc377ecbaae885941a08484bf259f5.tar.bz2 opensim-SC_OLD-3384f643ebbc377ecbaae885941a08484bf259f5.tar.xz | |
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
* Shouldn't break the build.
* Doesn't work yet either.
Diffstat (limited to 'OpenSim/Framework')
| -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); |