aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver
diff options
context:
space:
mode:
authorMelanie2012-10-20 02:33:24 +0100
committerMelanie2012-10-20 02:33:24 +0100
commit6ad8d3c43f130dfb80a7543e139ffa4dacb840ad (patch)
tree24baeecab6becf3bb30c26046ea95b75e6bbdc0f /OpenSim/Region/CoreModules/World/Archiver
parentMerge branch 'master' into careminster (diff)
parentminor: Rename assetCache constructor param in UUIDGatherer to assetService wh... (diff)
downloadopensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.zip
opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.gz
opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.bz2
opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 2127f4d..ade5e76 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -290,7 +290,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
290 290
291 foreach (DearchiveContext sceneContext in sceneContexts.Values) 291 foreach (DearchiveContext sceneContext in sceneContexts.Values)
292 { 292 {
293 m_log.InfoFormat("[ARCHIVER:] Loading region {0}", sceneContext.Scene.RegionInfo.RegionName); 293 m_log.InfoFormat("[ARCHIVER]: Loading region {0}", sceneContext.Scene.RegionInfo.RegionName);
294 294
295 if (!m_merge) 295 if (!m_merge)
296 { 296 {
@@ -324,7 +324,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
324 Util.FireAndForget(delegate(object o) 324 Util.FireAndForget(delegate(object o)
325 { 325 {
326 Thread.Sleep(15000); 326 Thread.Sleep(15000);
327 m_log.Info("Starting scripts in scene objects"); 327 m_log.Info("[ARCHIVER]: Starting scripts in scene objects");
328 328
329 foreach (DearchiveContext sceneContext in sceneContexts.Values) 329 foreach (DearchiveContext sceneContext in sceneContexts.Values)
330 { 330 {