aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs8
2 files changed, 6 insertions, 18 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index fec89da..7d83ee2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -42,8 +42,6 @@ using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.Region.Environment.Interfaces; 43using OpenSim.Region.Environment.Interfaces;
44using OpenSim.Region.Interfaces; 44using OpenSim.Region.Interfaces;
45using OpenSim.Region.Environment.Modules.World.Archiver;
46using OpenSim.Region.Environment.Modules.World.Serialiser;
47using OpenSim.Region.Environment.Modules.World.Terrain; 45using OpenSim.Region.Environment.Modules.World.Terrain;
48using OpenSim.Region.Environment.Scenes.Scripting; 46using OpenSim.Region.Environment.Scenes.Scripting;
49using OpenSim.Region.Physics.Manager; 47using OpenSim.Region.Physics.Manager;
@@ -1882,20 +1880,6 @@ namespace OpenSim.Region.Environment.Scenes
1882 return false; 1880 return false;
1883 } 1881 }
1884 1882
1885 public void LoadPrimsFromXml(string fileName, bool newIdsFlag, Vector3 loadOffset)
1886 {
1887 m_log.InfoFormat("[SCENE]: Loading prims in xml format to region {0} from {1}", RegionInfo.RegionName, fileName);
1888
1889 m_serialiser.LoadPrimsFromXml(this, fileName, newIdsFlag, loadOffset);
1890 }
1891
1892 public void SavePrimsToXml(string fileName)
1893 {
1894 m_log.InfoFormat("[SCENE]: Saving prims in xml format for region {0} to {1}", RegionInfo.RegionName, fileName);
1895
1896 m_serialiser.SavePrimsToXml(this, fileName);
1897 }
1898
1899 public void LoadPrimsFromXml2(string fileName) 1883 public void LoadPrimsFromXml2(string fileName)
1900 { 1884 {
1901 m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from {1}", RegionInfo.RegionName, fileName); 1885 m_log.InfoFormat("[SCENE]: Loading prims in xml2 format to region {0} from {1}", RegionInfo.RegionName, fileName);
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 6072b70..b973ced 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -184,7 +184,9 @@ namespace OpenSim.Region.Environment.Scenes
184 /// <param name="filename"></param> 184 /// <param name="filename"></param>
185 public void SaveCurrentSceneToXml(string filename) 185 public void SaveCurrentSceneToXml(string filename)
186 { 186 {
187 CurrentOrFirstScene.SavePrimsToXml(filename); 187 IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
188 if (serialiser != null)
189 serialiser.SavePrimsToXml(CurrentOrFirstScene, filename);
188 } 190 }
189 191
190 /// <summary> 192 /// <summary>
@@ -195,7 +197,9 @@ namespace OpenSim.Region.Environment.Scenes
195 /// <param name="loadOffset"></param> 197 /// <param name="loadOffset"></param>
196 public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, Vector3 loadOffset) 198 public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, Vector3 loadOffset)
197 { 199 {
198 CurrentOrFirstScene.LoadPrimsFromXml(filename, generateNewIDs, loadOffset); 200 IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>();
201 if (serialiser != null)
202 serialiser.LoadPrimsFromXml(CurrentOrFirstScene, filename, generateNewIDs, loadOffset);
199 } 203 }
200 204
201 /// <summary> 205 /// <summary>