aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs24
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index c9f8fce..0522372 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -62,6 +62,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
62 62
63 protected void DearchiveRegion() 63 protected void DearchiveRegion()
64 { 64 {
65 m_log.InfoFormat("[ARCHIVER]: Restoring archive {0}", m_loadPath);
66
65 TarArchiveReader archive 67 TarArchiveReader archive
66 = new TarArchiveReader( 68 = new TarArchiveReader(
67 new GZipStream(new FileStream(m_loadPath, FileMode.Open), CompressionMode.Decompress)); 69 new GZipStream(new FileStream(m_loadPath, FileMode.Open), CompressionMode.Decompress));
@@ -73,8 +75,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
73 byte[] data; 75 byte[] data;
74 while ((data = archive.ReadEntry(out filePath)) != null) 76 while ((data = archive.ReadEntry(out filePath)) != null)
75 { 77 {
76 m_log.DebugFormat( 78 //m_log.DebugFormat(
77 "[ARCHIVER]: Successfully read {0} ({1} bytes) from archive {2}", filePath, data.Length, m_loadPath); 79 // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length);
78 80
79 if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) 81 if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
80 { 82 {
@@ -95,7 +97,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
95 } 97 }
96 } 98 }
97 99
98 m_log.Debug("[ARCHIVER]: Reached end of archive"); 100 //m_log.Debug("[ARCHIVER]: Reached end of archive");
99 101
100 archive.Close(); 102 archive.Close();
101 103
@@ -111,14 +113,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
111 113
112 if (null != sceneObject) 114 if (null != sceneObject)
113 sceneObjects.Add(sceneObject); 115 sceneObjects.Add(sceneObject);
114 } 116 }
115
116 m_log.Debug("[ARCHIVER]: Starting scripts");
117
118 foreach (SceneObjectGroup sceneObject in sceneObjects)
119 {
120 sceneObject.CreateScriptInstances(0, true);
121 }
122 117
123 m_log.InfoFormat("[ARCHIVER]: Restored {0} objects to the scene", sceneObjects.Count); 118 m_log.InfoFormat("[ARCHIVER]: Restored {0} objects to the scene", sceneObjects.Count);
124 119
@@ -128,6 +123,13 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
128 m_log.WarnFormat("[ARCHIVER]: Ignored {0} objects that already existed in the scene", ignoredObjects); 123 m_log.WarnFormat("[ARCHIVER]: Ignored {0} objects that already existed in the scene", ignoredObjects);
129 124
130 m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive"); 125 m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");
126
127 m_log.Debug("[ARCHIVER]: Starting scripts");
128
129 foreach (SceneObjectGroup sceneObject in sceneObjects)
130 {
131 sceneObject.CreateScriptInstances(0, true);
132 }
131 } 133 }
132 134
133 /// <summary> 135 /// <summary>