aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-24 19:21:57 +0000
committerJustin Clarke Casey2008-05-24 19:21:57 +0000
commitdd4100db4c5b221b4feba4f873f40407d50fd4e1 (patch)
treef9149ae68b3c3e0b6a60f123e0299f588967f8dc /OpenSim/Region/Environment/Scenes
parent* If the SVN build version is not available, state this in the About box expl... (diff)
downloadopensim-SC-dd4100db4c5b221b4feba4f873f40407d50fd4e1.zip
opensim-SC-dd4100db4c5b221b4feba4f873f40407d50fd4e1.tar.gz
opensim-SC-dd4100db4c5b221b4feba4f873f40407d50fd4e1.tar.bz2
opensim-SC-dd4100db4c5b221b4feba4f873f40407d50fd4e1.tar.xz
* Get the xml2 entities serialization representation in the archiver module
* Not yet reusing serialization module - this will happen in the future * No user functionality yet
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a42bad5..60ba898 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.Environment.Scenes
1378 public void LoadPrimsFromArchive(string filePath) 1378 public void LoadPrimsFromArchive(string filePath)
1379 { 1379 {
1380 IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>(); 1380 IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>();
1381 archiver.DearchiveRegion(this, filePath); 1381 archiver.DearchiveRegion(filePath);
1382 } 1382 }
1383 1383
1384 /// <summary> 1384 /// <summary>
@@ -1388,7 +1388,7 @@ namespace OpenSim.Region.Environment.Scenes
1388 public void SavePrimsToArchive(string filePath) 1388 public void SavePrimsToArchive(string filePath)
1389 { 1389 {
1390 IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>(); 1390 IRegionArchiver archiver = RequestModuleInterface<IRegionArchiver>();
1391 archiver.ArchiveRegion(this, filePath); 1391 archiver.ArchiveRegion(filePath);
1392 } 1392 }
1393 1393
1394 /// <summary> 1394 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 2baef9d..eae041b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Environment.Scenes
201 /// <param name="filename"></param> 201 /// <param name="filename"></param>
202 public void SaveCurrentSceneToArchive(string filename) 202 public void SaveCurrentSceneToArchive(string filename)
203 { 203 {
204 CurrentOrFirstScene.LoadPrimsFromArchive(filename); 204 CurrentOrFirstScene.SavePrimsToArchive(filename);
205 } 205 }
206 206
207 /// <summary> 207 /// <summary>
@@ -217,7 +217,7 @@ namespace OpenSim.Region.Environment.Scenes
217 [Obsolete("TODO: Remove this warning by 0.7")] 217 [Obsolete("TODO: Remove this warning by 0.7")]
218 public bool RunTerrainCmdOnCurrentScene(string[] cmdparams, ref string result) 218 public bool RunTerrainCmdOnCurrentScene(string[] cmdparams, ref string result)
219 { 219 {
220 m_log.Warn("DEPRECIATED: The terrain engine has been replaced with a new terrain plugin module. Please type 'plugin terrain help' for new commands."); 220 m_log.Warn("DEPRECATED: The terrain engine has been replaced with a new terrain plugin module. Please type 'plugin terrain help' for new commands.");
221 return false; 221 return false;
222 } 222 }
223 223