diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 3f6e822..1e57be0 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -55,6 +55,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
55 | 55 | ||
56 | private Scene m_scene; | 56 | private Scene m_scene; |
57 | private Stream m_loadStream; | 57 | private Stream m_loadStream; |
58 | private Guid m_requestId; | ||
58 | private string m_errorMessage; | 59 | private string m_errorMessage; |
59 | 60 | ||
60 | /// <value> | 61 | /// <value> |
@@ -67,19 +68,21 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
67 | /// </summary> | 68 | /// </summary> |
68 | private IDictionary<UUID, bool> m_validUserUuids = new Dictionary<UUID, bool>(); | 69 | private IDictionary<UUID, bool> m_validUserUuids = new Dictionary<UUID, bool>(); |
69 | 70 | ||
70 | public ArchiveReadRequest(Scene scene, string loadPath, bool merge) | 71 | public ArchiveReadRequest(Scene scene, string loadPath, bool merge, Guid requestId) |
71 | { | 72 | { |
72 | m_scene = scene; | 73 | m_scene = scene; |
73 | m_loadStream = new GZipStream(GetStream(loadPath), CompressionMode.Decompress); | 74 | m_loadStream = new GZipStream(GetStream(loadPath), CompressionMode.Decompress); |
74 | m_errorMessage = String.Empty; | 75 | m_errorMessage = String.Empty; |
75 | m_merge = merge; | 76 | m_merge = merge; |
77 | m_requestId = requestId; | ||
76 | } | 78 | } |
77 | 79 | ||
78 | public ArchiveReadRequest(Scene scene, Stream loadStream, bool merge) | 80 | public ArchiveReadRequest(Scene scene, Stream loadStream, bool merge, Guid requestId) |
79 | { | 81 | { |
80 | m_scene = scene; | 82 | m_scene = scene; |
81 | m_loadStream = loadStream; | 83 | m_loadStream = loadStream; |
82 | m_merge = merge; | 84 | m_merge = merge; |
85 | m_requestId = requestId; | ||
83 | } | 86 | } |
84 | 87 | ||
85 | /// <summary> | 88 | /// <summary> |
@@ -141,7 +144,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
141 | m_log.ErrorFormat( | 144 | m_log.ErrorFormat( |
142 | "[ARCHIVER]: Error loading oar file. Exception was: {0}", e); | 145 | "[ARCHIVER]: Error loading oar file. Exception was: {0}", e); |
143 | m_errorMessage += e.ToString(); | 146 | m_errorMessage += e.ToString(); |
144 | m_scene.EventManager.TriggerOarFileLoaded(m_errorMessage); | 147 | m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage); |
145 | return; | 148 | return; |
146 | } | 149 | } |
147 | 150 | ||
@@ -163,8 +166,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
163 | m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); | 166 | m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); |
164 | 167 | ||
165 | IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface<IRegionSerialiserModule>(); | 168 | IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface<IRegionSerialiserModule>(); |
166 | int sceneObjectsLoadedCount = 0; | 169 | int sceneObjectsLoadedCount = 0; |
167 | |||
168 | 170 | ||
169 | foreach (string serialisedSceneObject in serialisedSceneObjects) | 171 | foreach (string serialisedSceneObject in serialisedSceneObjects) |
170 | { | 172 | { |
@@ -247,7 +249,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
247 | 249 | ||
248 | m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); | 250 | m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); |
249 | 251 | ||
250 | m_scene.EventManager.TriggerOarFileLoaded(m_errorMessage); | 252 | m_scene.EventManager.TriggerOarFileLoaded(m_requestId, m_errorMessage); |
251 | } | 253 | } |
252 | 254 | ||
253 | /// <summary> | 255 | /// <summary> |