aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-07-25 18:08:45 +0000
committerJustin Clarke Casey2008-07-25 18:08:45 +0000
commit0d488ad4898c2f3193a5e95567c138bda214cd9c (patch)
tree74190daf4c26001f1437b08bfce1d2b128dc2659
parentenabled a config option to inventory server to be able to stop it doing the S... (diff)
downloadopensim-SC-0d488ad4898c2f3193a5e95567c138bda214cd9c.zip
opensim-SC-0d488ad4898c2f3193a5e95567c138bda214cd9c.tar.gz
opensim-SC-0d488ad4898c2f3193a5e95567c138bda214cd9c.tar.bz2
opensim-SC-0d488ad4898c2f3193a5e95567c138bda214cd9c.tar.xz
* minor: just realized I managed to get the save xml/xml2 messages the wrong way around
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 98149f5..c4078c9 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1749,7 +1749,7 @@ namespace OpenSim.Region.Environment.Scenes
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} to {1}", RegionInfo.RegionName, fileName); 1752 m_log.InfoFormat("[SCENE]: Saving prims in xml 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 }
@@ -1763,12 +1763,11 @@ namespace OpenSim.Region.Environment.Scenes
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} to {1}", RegionInfo.RegionName, fileName); 1766 m_log.InfoFormat("[SCENE]: Saving prims in xml2 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 }
1770 1770
1771
1772 public void SaveNamedPrimsToXml2(string primName, string fileName) 1771 public void SaveNamedPrimsToXml2(string primName, string fileName)
1773 { 1772 {
1774 m_log.InfoFormat( 1773 m_log.InfoFormat(
@@ -1791,7 +1790,6 @@ namespace OpenSim.Region.Environment.Scenes
1791 m_serialiser.SavePrimListToXml2(primList, fileName); 1790 m_serialiser.SavePrimListToXml2(primList, fileName);
1792 } 1791 }
1793 1792
1794
1795 /// <summary> 1793 /// <summary>
1796 /// Load a prim archive into the scene. This loads both prims and their assets. 1794 /// Load a prim archive into the scene. This loads both prims and their assets.
1797 /// </summary> 1795 /// </summary>