From e7b3e7b749388dd8029ed7de6208fdf557e91695 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 29 Jul 2008 14:28:08 +0000
Subject: * Put in stub code for inventory backup. * No user functionality yet
 (and not for quite some time)

---
 OpenSim/Region/Application/OpenSim.cs              | 27 +++++++++++++++++++---
 OpenSim/Region/Application/OpenSimBase.cs          |  9 ++++++--
 .../Region/Environment/Scenes/Scene.Inventory.cs   |  1 +
 3 files changed, 32 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 27b6694..66c7c48 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -323,6 +323,10 @@ namespace OpenSim
                 case "save-oar":
                     SaveOar(cmdparams);
                     break;
+                    
+                case "save-inv":
+                    SaveInv(cmdparams);
+                    break;
 
                 case "plugin":
                     m_sceneManager.SendCommandToPluginModules(cmdparams);
@@ -724,9 +728,13 @@ namespace OpenSim
             }
         }           
         
+        /// <summary>
+        /// Load a whole region from an opensim archive.
+        /// </summary>
+        /// <param name="cmdparams"></param>
         protected void LoadOar(string[] cmdparams)
         {
-            m_log.Warn("[CONSOLE]: Experimental functionality.  Please don't rely on this.");
+            m_log.Warn("[CONSOLE]: Experimental functionality.  Please don't rely on this yet.");
             m_log.Warn("[CONSOLE]: See http://opensimulator.org/wiki/OpenSim_Archives for more details.");
 
             if (cmdparams.Length > 0)
@@ -739,9 +747,13 @@ namespace OpenSim
             }            
         }
         
+        /// <summary>
+        /// Save a region to a file, including all the assets needed to restore it.
+        /// </summary>
+        /// <param name="cmdparams"></param>
         protected void SaveOar(string[] cmdparams)
         {
-            m_log.Warn("[CONSOLE]: Experimental functionality.  Please don't rely on this.");
+            m_log.Warn("[CONSOLE]: Experimental functionality.  Please don't rely on this yet.");
             m_log.Warn("[CONSOLE]: See http://opensimulator.org/wiki/OpenSim_Archives for more details.");
 
             if (cmdparams.Length > 0)
@@ -752,7 +764,16 @@ namespace OpenSim
             {
                 m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME);
             }           
-        }        
+        }      
+        
+        /// <summary>
+        /// Save inventory to a file.
+        /// </summary>
+        /// <param name="cmdparams"></param>
+        protected void SaveInv(string[] cmdparams)
+        {
+            m_log.Error("[CONSOLE]: This has not been implemented yet!");
+        }
 
         private static string CombineParams(string[] commandParams, int pos)
         {
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index c2d30e4..a9351d3 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -62,14 +62,19 @@ namespace OpenSim
         protected int proxyOffset = 0;
 
         /// <summary>
-        /// The file used to load and save prim backup xml if none has been specified
+        /// The file used to load and save prim backup xml if no filename has been specified
         /// </summary>
         protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml";
 
         /// <summary>
-        /// The file use to load and save an opensim archive if none has been specified
+        /// The file used to load and save an opensim archive if no filename has been specified
         /// </summary>
         protected const string DEFAULT_OAR_BACKUP_FILENAME = "scene_oar.tar.gz";
+        
+        /// <summary>
+        /// The file to load and save inventory if no filename has been specified
+        /// </summary>
+        protected const string DEFAULT_INV_BACKUP_FILENAME = "opensim_inv.tar.gz";
 
         public string m_physicsEngine;
         public string m_meshEngineName;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index d0c5842..0ba5121 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1784,6 +1784,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
         }
+        
         public LLUUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID AgentId)
         {
             SceneObjectGroup objectGroup = grp;
-- 
cgit v1.1