aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-15 19:12:37 +0000
committerJustin Clarke Casey2009-04-15 19:12:37 +0000
commit63936d442ca7e6bdc0f09a5e974c57b3b5726353 (patch)
treeadd84f90ce716015e93f9dae721e7876992e6b6c /OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
parentConvert both script engines to new region module format. Add proper unload (diff)
downloadopensim-SC_OLD-63936d442ca7e6bdc0f09a5e974c57b3b5726353.zip
opensim-SC_OLD-63936d442ca7e6bdc0f09a5e974c57b3b5726353.tar.gz
opensim-SC_OLD-63936d442ca7e6bdc0f09a5e974c57b3b5726353.tar.bz2
opensim-SC_OLD-63936d442ca7e6bdc0f09a5e974c57b3b5726353.tar.xz
* Make it possible to add a request id to load and save oar requests
* This allows specific requests to be identified.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index 85391b3..943d9d1 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -58,19 +58,22 @@ namespace OpenSim.Region.CoreModules.World.Archiver
58 protected List<SceneObjectGroup> m_sceneObjects; 58 protected List<SceneObjectGroup> m_sceneObjects;
59 protected Scene m_scene; 59 protected Scene m_scene;
60 protected Stream m_saveStream; 60 protected Stream m_saveStream;
61 protected Guid m_requestId;
61 62
62 public ArchiveWriteRequestExecution( 63 public ArchiveWriteRequestExecution(
63 List<SceneObjectGroup> sceneObjects, 64 List<SceneObjectGroup> sceneObjects,
64 ITerrainModule terrainModule, 65 ITerrainModule terrainModule,
65 IRegionSerialiserModule serialiser, 66 IRegionSerialiserModule serialiser,
66 Scene scene, 67 Scene scene,
67 Stream saveStream) 68 Stream saveStream,
69 Guid requestId)
68 { 70 {
69 m_sceneObjects = sceneObjects; 71 m_sceneObjects = sceneObjects;
70 m_terrainModule = terrainModule; 72 m_terrainModule = terrainModule;
71 m_serialiser = serialiser; 73 m_serialiser = serialiser;
72 m_scene = scene; 74 m_scene = scene;
73 m_saveStream = saveStream; 75 m_saveStream = saveStream;
76 m_requestId = requestId;
74 } 77 }
75 78
76 protected internal void ReceivedAllAssets( 79 protected internal void ReceivedAllAssets(
@@ -140,7 +143,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
140 143
141 m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive for {0}", m_scene.RegionInfo.RegionName); 144 m_log.InfoFormat("[ARCHIVER]: Wrote out OpenSimulator archive for {0}", m_scene.RegionInfo.RegionName);
142 145
143 m_scene.EventManager.TriggerOarFileSaved(String.Empty); 146 m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty);
144 } 147 }
145 148
146 /// <summary> 149 /// <summary>