From fb91a1aa49c098d03989a931280eaf668dceef18 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 28 May 2008 17:49:34 +0000
Subject: * 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

---
 OpenSim/Region/Environment/Scenes/SceneManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

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
         public void LoadCurrentSceneFromXml2(string filename)
         {
             CurrentOrFirstScene.LoadPrimsFromXml2(filename);
-        }
+        }        
 
         /// <summary>
         /// 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
         /// their assets to the asset service.
         /// </summary>
         /// <param name="filename"></param>
-        public void LoadCurrentSceneFromArchive(string filename)
+        public void LoadArchiveToCurrentScene(string filename)
         {
-            CurrentOrFirstScene.SavePrimsToArchive(filename);
+            CurrentOrFirstScene.LoadPrimsFromArchive(filename);
         }
 
         [Obsolete("TODO: Remove this warning by 0.7")]
-- 
cgit v1.1