diff options
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 114dd13..3c0997c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -453,6 +453,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
453 | /// <summary> | 453 | /// <summary> |
454 | /// Resolve path to a working FileStream | 454 | /// Resolve path to a working FileStream |
455 | /// </summary> | 455 | /// </summary> |
456 | /// <param name="path"></param> | ||
457 | /// <returns></returns> | ||
456 | private Stream GetStream(string path) | 458 | private Stream GetStream(string path) |
457 | { | 459 | { |
458 | if (File.Exists(path)) | 460 | if (File.Exists(path)) |
@@ -499,8 +501,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
499 | WebResponse response = request.GetResponse(); | 501 | WebResponse response = request.GetResponse(); |
500 | Stream file = response.GetResponseStream(); | 502 | Stream file = response.GetResponseStream(); |
501 | 503 | ||
502 | if (response.ContentType != "application/x-oar") | 504 | // justincc: gonna ignore the content type for now and just try anything |
503 | throw new Exception(String.Format("{0} does not identify an OAR file", uri.ToString())); | 505 | //if (response.ContentType != "application/x-oar") |
506 | // throw new Exception(String.Format("{0} does not identify an OAR file", uri.ToString())); | ||
504 | 507 | ||
505 | if (response.ContentLength == 0) | 508 | if (response.ContentLength == 0) |
506 | throw new Exception(String.Format("{0} returned an empty file", uri.ToString())); | 509 | throw new Exception(String.Format("{0} returned an empty file", uri.ToString())); |