From d9db56d86b3e83eef87ff22fe27d32efba8b0dd7 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 21 Jul 2008 17:52:53 +0000 Subject: * minor: stick filename being loaded/saved from in save/load xml/oar information messages --- .../Modules/World/Archiver/ArchiveReadRequest.cs | 4 +--- OpenSim/Region/Environment/Scenes/Scene.cs | 15 ++++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index 985b939..a26a1c7 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs @@ -61,9 +61,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver } protected void DearchiveRegion() - { - m_log.InfoFormat("[ARCHIVER]: Restoring archive {0}", m_loadPath); - + { TarArchiveReader archive = new TarArchiveReader( new GZipStream(new FileStream(m_loadPath, FileMode.Open), CompressionMode.Decompress)); diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 067d247..626aaaa 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -1742,28 +1742,28 @@ namespace OpenSim.Region.Environment.Scenes public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset) { - m_log.InfoFormat("[SCENE]: Loading prims in xml format to region {0}", RegionInfo.RegionName); + m_log.InfoFormat("[SCENE]: Loading prims in xml format to region {0} from {1}", RegionInfo.RegionName); m_serialiser.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset); } public void SavePrimsToXml(string fileName) { - m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0}", RegionInfo.RegionName); + m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to {1}", RegionInfo.RegionName, fileName); m_serialiser.SavePrimsToXml(this, fileName); } public void LoadPrimsFromXml2(string fileName) { - m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0}", RegionInfo.RegionName); + m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from {1}", RegionInfo.RegionName, fileName); m_serialiser.LoadPrimsFromXml2(this, fileName); } public void SavePrimsToXml2(string fileName) { - m_log.InfoFormat("[SCENE]: Saving prims in xml format for region {0}", RegionInfo.RegionName); + m_log.InfoFormat("[SCENE]: Saving prims in xml format for region {0} to {1}", RegionInfo.RegionName, fileName); m_serialiser.SavePrimsToXml2(this, fileName); } @@ -1771,7 +1771,8 @@ namespace OpenSim.Region.Environment.Scenes public void SaveNamedPrimsToXml2(string primName, string fileName) { - m_log.InfoFormat("[SCENE]: Saving prims with name {0} in xml2 format to region {1}", primName, RegionInfo.RegionName); + m_log.InfoFormat( + "[SCENE]: Saving prims with name {0} in xml2 format for region {1} to {2}", primName, RegionInfo.RegionName, fileName); List entityList = GetEntities(); List primList = new List(); @@ -1797,7 +1798,7 @@ namespace OpenSim.Region.Environment.Scenes /// public void LoadPrimsFromArchive(string filePath) { - m_log.InfoFormat("[SCENE]: Loading archive to region {0}", RegionInfo.RegionName); + m_log.InfoFormat("[SCENE]: Loading archive to region {0} from {1}", RegionInfo.RegionName, filePath); m_archiver.DearchiveRegion(filePath); } @@ -1808,7 +1809,7 @@ namespace OpenSim.Region.Environment.Scenes /// public void SavePrimsToArchive(string filePath) { - m_log.InfoFormat("[SCENE]: Writing archive for region {0}", RegionInfo.RegionName); + m_log.InfoFormat("[SCENE]: Writing archive for region {0} to {1}", RegionInfo.RegionName, filePath); m_archiver.ArchiveRegion(filePath); } -- cgit v1.1