diff options
author | Melanie | 2010-02-22 03:00:59 +0000 |
---|---|---|
committer | Melanie | 2010-02-22 03:00:59 +0000 |
commit | 1f45e6c6497e05638f014e92098165befbbea100 (patch) | |
tree | 0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |
parent | One more test running. (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.zip opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.gz opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2 opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.xz |
Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 14 |
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 59a1b8f..08dfb75 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -74,7 +74,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
74 | public ArchiveReadRequest(Scene scene, string loadPath, bool merge, Guid requestId) | 74 | public ArchiveReadRequest(Scene scene, string loadPath, bool merge, Guid requestId) |
75 | { | 75 | { |
76 | m_scene = scene; | 76 | m_scene = scene; |
77 | m_loadStream = new GZipStream(GetStream(loadPath), CompressionMode.Decompress); | 77 | |
78 | try | ||
79 | { | ||
80 | m_loadStream = new GZipStream(GetStream(loadPath), CompressionMode.Decompress); | ||
81 | } | ||
82 | catch (EntryPointNotFoundException e) | ||
83 | { | ||
84 | m_log.ErrorFormat( | ||
85 | "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream." | ||
86 | + "If you've manually installed Mono, have you appropriately updated zlib1g as well?"); | ||
87 | m_log.Error(e); | ||
88 | } | ||
89 | |||
78 | m_errorMessage = String.Empty; | 90 | m_errorMessage = String.Empty; |
79 | m_merge = merge; | 91 | m_merge = merge; |
80 | m_requestId = requestId; | 92 | m_requestId = requestId; |