aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorMelanie2010-10-16 10:51:44 +0200
committerMelanie2010-10-16 10:51:44 +0200
commite6d0fb0b0e0c99f17b575dbc067a08dc543c9eb9 (patch)
tree69f4ded6e83563d95faaff5df8731f7201efceaa /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentActually set the PrivateBinPath in XEngine so relocating the scripts (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-e6d0fb0b0e0c99f17b575dbc067a08dc543c9eb9.zip
opensim-SC_OLD-e6d0fb0b0e0c99f17b575dbc067a08dc543c9eb9.tar.gz
opensim-SC_OLD-e6d0fb0b0e0c99f17b575dbc067a08dc543c9eb9.tar.bz2
opensim-SC_OLD-e6d0fb0b0e0c99f17b575dbc067a08dc543c9eb9.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs3
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);