diff options
author | Teravus Ovares | 2009-03-07 06:14:31 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-03-07 06:14:31 +0000 |
commit | 5b8c92564163609b4f8a4118f9586f3a7dfe8b40 (patch) | |
tree | eb56ad35dd51f269821b87cd739d4b03661daa65 /OpenSim | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC-5b8c92564163609b4f8a4118f9586f3a7dfe8b40.zip opensim-SC-5b8c92564163609b4f8a4118f9586f3a7dfe8b40.tar.gz opensim-SC-5b8c92564163609b4f8a4118f9586f3a7dfe8b40.tar.bz2 opensim-SC-5b8c92564163609b4f8a4118f9586f3a7dfe8b40.tar.xz |
* Adding application/x-oar to the list of content types to which the HTTP Server will return the response as if it was a binary file pending discussion on the [opensim-dev] mailing list to be initiated by dmiles.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index d6f0630..361f895 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -1267,12 +1267,16 @@ namespace OpenSim.Framework.Servers | |||
1267 | 1267 | ||
1268 | byte[] buffer; | 1268 | byte[] buffer; |
1269 | 1269 | ||
1270 | if (!(contentType.Contains("image") || contentType.Contains("x-shockwave-flash"))) | 1270 | if (!(contentType.Contains("image") |
1271 | || contentType.Contains("x-shockwave-flash") | ||
1272 | || contentType.Contains("application/x-oar"))) | ||
1271 | { | 1273 | { |
1274 | // Text | ||
1272 | buffer = Encoding.UTF8.GetBytes(responseString); | 1275 | buffer = Encoding.UTF8.GetBytes(responseString); |
1273 | } | 1276 | } |
1274 | else | 1277 | else |
1275 | { | 1278 | { |
1279 | // Binary! | ||
1276 | buffer = Convert.FromBase64String(responseString); | 1280 | buffer = Convert.FromBase64String(responseString); |
1277 | } | 1281 | } |
1278 | 1282 | ||