aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs28
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs8
2 files changed, 6 insertions, 30 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7d83ee2..eaf04ea 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1880,34 +1880,6 @@ namespace OpenSim.Region.Environment.Scenes
1880 return false; 1880 return false;
1881 } 1881 }
1882 1882
1883 public void LoadPrimsFromXml2(string fileName)
1884 {
1885 m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from {1}", RegionInfo.RegionName, fileName);
1886
1887 m_serialiser.LoadPrimsFromXml2(this, fileName);
1888 }
1889
1890 public void LoadPrimsFromXml2(TextReader reader, bool startScripts)
1891 {
1892 m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from stream", RegionInfo.RegionName);
1893
1894 m_serialiser.LoadPrimsFromXml2(this, reader, startScripts);
1895 }
1896
1897 public void SavePrimsToXml2(string fileName)
1898 {
1899 m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to {1}", RegionInfo.RegionName, fileName);
1900
1901 m_serialiser.SavePrimsToXml2(this, fileName);
1902 }
1903
1904 public void SavePrimsToXml2(TextWriter stream, Vector3 min, Vector3 max)
1905 {
1906 m_log.InfoFormat("[SCENE]: Saving prims in xml2 format for region {0} to stream", RegionInfo.RegionName);
1907
1908 m_serialiser.SavePrimsToXml2(this, stream, min, max);
1909 }
1910
1911 public void SaveNamedPrimsToXml2(string primName, string fileName) 1883 public void SaveNamedPrimsToXml2(string primName, string fileName)
1912 { 1884 {
1913 m_log.InfoFormat( 1885 m_log.InfoFormat(
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index b973ced..9e83f25 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -208,7 +208,9 @@ namespace OpenSim.Region.Environment.Scenes
208 /// <param name="filename"></param> 208 /// <param name="filename"></param>
209 public void SaveCurrentSceneToXml2(string filename) 209 public void SaveCurrentSceneToXml2(string filename)
210 { 210 {
211 CurrentOrFirstScene.SavePrimsToXml2(filename); 211 IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
212 if (serialiser != null)
213 serialiser.SavePrimsToXml2(CurrentOrFirstScene, filename);
212 } 214 }
213 215
214 public void SaveNamedPrimsToXml2(string primName, string filename) 216 public void SaveNamedPrimsToXml2(string primName, string filename)
@@ -221,7 +223,9 @@ namespace OpenSim.Region.Environment.Scenes
221 /// </summary> 223 /// </summary>
222 public void LoadCurrentSceneFromXml2(string filename) 224 public void LoadCurrentSceneFromXml2(string filename)
223 { 225 {
224 CurrentOrFirstScene.LoadPrimsFromXml2(filename); 226 IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
227 if (serialiser != null)
228 serialiser.LoadPrimsFromXml2(CurrentOrFirstScene, filename);
225 } 229 }
226 230
227 /// <summary> 231 /// <summary>