aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs14
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 8ed1913..ad58f40 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -73,7 +73,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
73 public ArchiveReadRequest(Scene scene, string loadPath, bool merge, Guid requestId) 73 public ArchiveReadRequest(Scene scene, string loadPath, bool merge, Guid requestId)
74 { 74 {
75 m_scene = scene; 75 m_scene = scene;
76 m_loadStream = new GZipStream(GetStream(loadPath), CompressionMode.Decompress); 76
77 try
78 {
79 m_loadStream = new GZipStream(GetStream(loadPath), CompressionMode.Decompress);
80 }
81 catch (EntryPointNotFoundException e)
82 {
83 m_log.ErrorFormat(
84 "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream."
85 + "If you've manually installed Mono, have you appropriately updated zlib1g as well?");
86 m_log.Error(e);
87 }
88
77 m_errorMessage = String.Empty; 89 m_errorMessage = String.Empty;
78 m_merge = merge; 90 m_merge = merge;
79 m_requestId = requestId; 91 m_requestId = requestId;