Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-16 02:27:51 +01:00
20 changed files with 28920 additions and 28276 deletions

View File

@@ -1474,7 +1474,8 @@ namespace OpenSim.Framework.Servers.HttpServer
if (!(contentType.Contains("image")
|| contentType.Contains("x-shockwave-flash")
|| contentType.Contains("application/x-oar")))
|| contentType.Contains("application/x-oar")
|| contentType.Contains("application/vnd.ll.mesh")))
{
// Text
buffer = Encoding.UTF8.GetBytes(responseString);