diff options
author | Justin Clarke Casey | 2008-07-21 17:42:13 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-21 17:42:13 +0000 |
commit | 8948ecbd8bdd9030c65760433aeafcc0ca480b4d (patch) | |
tree | f4b58f6278a82fe4997dcbad216f404c431161f1 | |
parent | * minor: add wiki link to archiving function invocation (diff) | |
download | opensim-SC_OLD-8948ecbd8bdd9030c65760433aeafcc0ca480b4d.zip opensim-SC_OLD-8948ecbd8bdd9030c65760433aeafcc0ca480b4d.tar.gz opensim-SC_OLD-8948ecbd8bdd9030c65760433aeafcc0ca480b4d.tar.bz2 opensim-SC_OLD-8948ecbd8bdd9030c65760433aeafcc0ca480b4d.tar.xz |
* minor: Make it clearer the region on which save and load xml/oar commands are operating
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index c2398b6..067d247 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1742,27 +1742,37 @@ 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); | ||
1746 | |||
1745 | m_serialiser.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset); | 1747 | m_serialiser.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset); |
1746 | } | 1748 | } |
1747 | 1749 | ||
1748 | public void SavePrimsToXml(string fileName) | 1750 | public void SavePrimsToXml(string fileName) |
1749 | { | 1751 | { |
1752 | m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0}", RegionInfo.RegionName); | ||
1753 | |||
1750 | m_serialiser.SavePrimsToXml(this, fileName); | 1754 | m_serialiser.SavePrimsToXml(this, fileName); |
1751 | } | 1755 | } |
1752 | 1756 | ||
1753 | public void LoadPrimsFromXml2(string fileName) | 1757 | public void LoadPrimsFromXml2(string fileName) |
1754 | { | 1758 | { |
1759 | m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0}", RegionInfo.RegionName); | ||
1760 | |||
1755 | m_serialiser.LoadPrimsFromXml2(this, fileName); | 1761 | m_serialiser.LoadPrimsFromXml2(this, fileName); |
1756 | } | 1762 | } |
1757 | 1763 | ||
1758 | public void SavePrimsToXml2(string fileName) | 1764 | public void SavePrimsToXml2(string fileName) |
1759 | { | 1765 | { |
1766 | m_log.InfoFormat("[SCENE]: Saving prims in xml format for region {0}", RegionInfo.RegionName); | ||
1767 | |||
1760 | m_serialiser.SavePrimsToXml2(this, fileName); | 1768 | m_serialiser.SavePrimsToXml2(this, fileName); |
1761 | } | 1769 | } |
1762 | 1770 | ||
1763 | 1771 | ||
1764 | public void SaveNamedPrimsToXml2(string primName, string fileName) | 1772 | public void SaveNamedPrimsToXml2(string primName, string fileName) |
1765 | { | 1773 | { |
1774 | m_log.InfoFormat("[SCENE]: Saving prims with name {0} in xml2 format to region {1}", primName, RegionInfo.RegionName); | ||
1775 | |||
1766 | List<EntityBase> entityList = GetEntities(); | 1776 | List<EntityBase> entityList = GetEntities(); |
1767 | List<EntityBase> primList = new List<EntityBase>(); | 1777 | List<EntityBase> primList = new List<EntityBase>(); |
1768 | 1778 | ||
@@ -1787,6 +1797,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1787 | /// <param name="filePath"></param> | 1797 | /// <param name="filePath"></param> |
1788 | public void LoadPrimsFromArchive(string filePath) | 1798 | public void LoadPrimsFromArchive(string filePath) |
1789 | { | 1799 | { |
1800 | m_log.InfoFormat("[SCENE]: Loading archive to region {0}", RegionInfo.RegionName); | ||
1801 | |||
1790 | m_archiver.DearchiveRegion(filePath); | 1802 | m_archiver.DearchiveRegion(filePath); |
1791 | } | 1803 | } |
1792 | 1804 | ||
@@ -1796,6 +1808,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1796 | /// <param name="filePath"></param> | 1808 | /// <param name="filePath"></param> |
1797 | public void SavePrimsToArchive(string filePath) | 1809 | public void SavePrimsToArchive(string filePath) |
1798 | { | 1810 | { |
1811 | m_log.InfoFormat("[SCENE]: Writing archive for region {0}", RegionInfo.RegionName); | ||
1812 | |||
1799 | m_archiver.ArchiveRegion(filePath); | 1813 | m_archiver.ArchiveRegion(filePath); |
1800 | } | 1814 | } |
1801 | 1815 | ||