aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs15
2 files changed, 9 insertions, 10 deletions
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
61 } 61 }
62 62
63 protected void DearchiveRegion() 63 protected void DearchiveRegion()
64 { 64 {
65 m_log.InfoFormat("[ARCHIVER]: Restoring archive {0}", m_loadPath);
66
67 TarArchiveReader archive 65 TarArchiveReader archive
68 = new TarArchiveReader( 66 = new TarArchiveReader(
69 new GZipStream(new FileStream(m_loadPath, FileMode.Open), CompressionMode.Decompress)); 67 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
1742 1742
1743 public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset) 1743 public void LoadPrimsFromXml(string fileName, bool newIdsFlag, LLVector3 loadOffset)
1744 { 1744 {
1745 m_log.InfoFormat("[SCENE]: Loading prims in xml format to region {0}", RegionInfo.RegionName); 1745 m_log.InfoFormat("[SCENE]: Loading prims in xml format to region {0} from {1}", RegionInfo.RegionName);
1746 1746
1747 m_serialiser.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset); 1747 m_serialiser.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset);
1748 } 1748 }
1749 1749
1750 public void SavePrimsToXml(string fileName) 1750 public void SavePrimsToXml(string fileName)
1751 { 1751 {
1752 m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0}", RegionInfo.RegionName); 1752 m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to {1}", RegionInfo.RegionName, fileName);
1753 1753
1754 m_serialiser.SavePrimsToXml(this, fileName); 1754 m_serialiser.SavePrimsToXml(this, fileName);
1755 } 1755 }
1756 1756
1757 public void LoadPrimsFromXml2(string fileName) 1757 public void LoadPrimsFromXml2(string fileName)
1758 { 1758 {
1759 m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0}", RegionInfo.RegionName); 1759 m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from {1}", RegionInfo.RegionName, fileName);
1760 1760
1761 m_serialiser.LoadPrimsFromXml2(this, fileName); 1761 m_serialiser.LoadPrimsFromXml2(this, fileName);
1762 } 1762 }
1763 1763
1764 public void SavePrimsToXml2(string fileName) 1764 public void SavePrimsToXml2(string fileName)
1765 { 1765 {
1766 m_log.InfoFormat("[SCENE]: Saving prims in xml format for region {0}", RegionInfo.RegionName); 1766 m_log.InfoFormat("[SCENE]: Saving prims in xml format for region {0} to {1}", RegionInfo.RegionName, fileName);
1767 1767
1768 m_serialiser.SavePrimsToXml2(this, fileName); 1768 m_serialiser.SavePrimsToXml2(this, fileName);
1769 } 1769 }
@@ -1771,7 +1771,8 @@ namespace OpenSim.Region.Environment.Scenes
1771 1771
1772 public void SaveNamedPrimsToXml2(string primName, string fileName) 1772 public void SaveNamedPrimsToXml2(string primName, string fileName)
1773 { 1773 {
1774 m_log.InfoFormat("[SCENE]: Saving prims with name {0} in xml2 format to region {1}", primName, RegionInfo.RegionName); 1774 m_log.InfoFormat(
1775 "[SCENE]: Saving prims with name {0} in xml2 format for region {1} to {2}", primName, RegionInfo.RegionName, fileName);
1775 1776
1776 List<EntityBase> entityList = GetEntities(); 1777 List<EntityBase> entityList = GetEntities();
1777 List<EntityBase> primList = new List<EntityBase>(); 1778 List<EntityBase> primList = new List<EntityBase>();
@@ -1797,7 +1798,7 @@ namespace OpenSim.Region.Environment.Scenes
1797 /// <param name="filePath"></param> 1798 /// <param name="filePath"></param>
1798 public void LoadPrimsFromArchive(string filePath) 1799 public void LoadPrimsFromArchive(string filePath)
1799 { 1800 {
1800 m_log.InfoFormat("[SCENE]: Loading archive to region {0}", RegionInfo.RegionName); 1801 m_log.InfoFormat("[SCENE]: Loading archive to region {0} from {1}", RegionInfo.RegionName, filePath);
1801 1802
1802 m_archiver.DearchiveRegion(filePath); 1803 m_archiver.DearchiveRegion(filePath);
1803 } 1804 }
@@ -1808,7 +1809,7 @@ namespace OpenSim.Region.Environment.Scenes
1808 /// <param name="filePath"></param> 1809 /// <param name="filePath"></param>
1809 public void SavePrimsToArchive(string filePath) 1810 public void SavePrimsToArchive(string filePath)
1810 { 1811 {
1811 m_log.InfoFormat("[SCENE]: Writing archive for region {0}", RegionInfo.RegionName); 1812 m_log.InfoFormat("[SCENE]: Writing archive for region {0} to {1}", RegionInfo.RegionName, filePath);
1812 1813
1813 m_archiver.ArchiveRegion(filePath); 1814 m_archiver.ArchiveRegion(filePath);
1814 } 1815 }