aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs15
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index bd02b7e..4e7e764 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.Drawing.Imaging; 31using System.Drawing.Imaging;
32using System.IO;
32using System.Threading; 33using System.Threading;
33using System.Timers; 34using System.Timers;
34using Axiom.Math; 35using Axiom.Math;
@@ -1760,6 +1761,13 @@ namespace OpenSim.Region.Environment.Scenes
1760 m_serialiser.LoadPrimsFromXml2(this, fileName); 1761 m_serialiser.LoadPrimsFromXml2(this, fileName);
1761 } 1762 }
1762 1763
1764 public void LoadPrimsFromXml2(TextReader reader, bool startScripts)
1765 {
1766 m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from stream", RegionInfo.RegionName);
1767
1768 m_serialiser.LoadPrimsFromXml2(this, reader, startScripts);
1769 }
1770
1763 public void SavePrimsToXml2(string fileName) 1771 public void SavePrimsToXml2(string fileName)
1764 { 1772 {
1765 m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to {1}", RegionInfo.RegionName, fileName); 1773 m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to {1}", RegionInfo.RegionName, fileName);
@@ -1767,6 +1775,13 @@ namespace OpenSim.Region.Environment.Scenes
1767 m_serialiser.SavePrimsToXml2(this, fileName); 1775 m_serialiser.SavePrimsToXml2(this, fileName);
1768 } 1776 }
1769 1777
1778 public void SavePrimsToXml2(TextWriter stream, LLVector3 min, LLVector3 max)
1779 {
1780 m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to stream", RegionInfo.RegionName);
1781
1782 m_serialiser.SavePrimsToXml2(this, stream, min, max);
1783 }
1784
1770 public void SaveNamedPrimsToXml2(string primName, string fileName) 1785 public void SaveNamedPrimsToXml2(string primName, string fileName)
1771 { 1786 {
1772 m_log.InfoFormat( 1787 m_log.InfoFormat(