aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-28 17:49:34 +0000
committerJustin Clarke Casey2008-05-28 17:49:34 +0000
commitfb91a1aa49c098d03989a931280eaf668dceef18 (patch)
tree15dc2b18eaa7fac353d07eda7a6bf21fce1cfd64 /OpenSim/Region/Environment/Scenes
parentspring cleaning, remove a bit of db4o grid server (diff)
downloadopensim-SC_OLD-fb91a1aa49c098d03989a931280eaf668dceef18.zip
opensim-SC_OLD-fb91a1aa49c098d03989a931280eaf668dceef18.tar.gz
opensim-SC_OLD-fb91a1aa49c098d03989a931280eaf668dceef18.tar.bz2
opensim-SC_OLD-fb91a1aa49c098d03989a931280eaf668dceef18.tar.xz
* Put in stubs for "load-oar" command, including ultra-primitive temporary tar loading code
* Currently as a test, this will successfully load only the first file of an opensim archive and do absolutely nothing with it
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 66174bf..63146bd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Scenes
192 public void LoadCurrentSceneFromXml2(string filename) 192 public void LoadCurrentSceneFromXml2(string filename)
193 { 193 {
194 CurrentOrFirstScene.LoadPrimsFromXml2(filename); 194 CurrentOrFirstScene.LoadPrimsFromXml2(filename);
195 } 195 }
196 196
197 /// <summary> 197 /// <summary>
198 /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets 198 /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets
@@ -209,9 +209,9 @@ namespace OpenSim.Region.Environment.Scenes
209 /// their assets to the asset service. 209 /// their assets to the asset service.
210 /// </summary> 210 /// </summary>
211 /// <param name="filename"></param> 211 /// <param name="filename"></param>
212 public void LoadCurrentSceneFromArchive(string filename) 212 public void LoadArchiveToCurrentScene(string filename)
213 { 213 {
214 CurrentOrFirstScene.SavePrimsToArchive(filename); 214 CurrentOrFirstScene.LoadPrimsFromArchive(filename);
215 } 215 }
216 216
217 [Obsolete("TODO: Remove this warning by 0.7")] 217 [Obsolete("TODO: Remove this warning by 0.7")]