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.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 73fd916..9a0f19a 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -88,15 +88,15 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
88 int failedAssetRestores = 0; 88 int failedAssetRestores = 0;
89 89
90 byte[] data; 90 byte[] data;
91 TarArchiveReader.TarEntryType entryType; 91 TarArchiveReader.TarEntryType entryType;
92 while ((data = archive.ReadEntry(out filePath, out entryType)) != null) 92 while ((data = archive.ReadEntry(out filePath, out entryType)) != null)
93 { 93 {
94 //m_log.DebugFormat( 94 //m_log.DebugFormat(
95 // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length); 95 // "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length);
96 if (entryType==TarArchiveReader.TarEntryType.TYPE_DIRECTORY) { 96 if (entryType==TarArchiveReader.TarEntryType.TYPE_DIRECTORY) {
97 m_log.WarnFormat("[ARCHIVER]: Ignoring directory entry {0}", 97 m_log.WarnFormat("[ARCHIVER]: Ignoring directory entry {0}",
98 filePath); 98 filePath);
99 } 99 }
100 else if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) 100 else if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
101 { 101 {
102 serialisedSceneObjects.Add(m_asciiEncoding.GetString(data)); 102 serialisedSceneObjects.Add(m_asciiEncoding.GetString(data));
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
122 LoadRegionSettings(filePath, data); 122 LoadRegionSettings(filePath, data);
123 } 123 }
124 } 124 }
125 125
126 //m_log.Debug("[ARCHIVER]: Reached end of archive"); 126 //m_log.Debug("[ARCHIVER]: Reached end of archive");
127 127
128 archive.Close(); 128 archive.Close();
@@ -131,10 +131,10 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
131 131
132 if (failedAssetRestores > 0) 132 if (failedAssetRestores > 0)
133 m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores); 133 m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores);
134 134
135 m_log.Info("[ARCHIVER]: Clearing all existing scene objects"); 135 m_log.Info("[ARCHIVER]: Clearing all existing scene objects");
136 m_scene.DeleteAllSceneObjects(); 136 m_scene.DeleteAllSceneObjects();
137 137
138 // Reload serialized prims 138 // Reload serialized prims
139 m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); 139 m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count);
140 140