diff options
author | Justin Clarke Casey | 2008-07-29 14:28:08 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-29 14:28:08 +0000 |
commit | e7b3e7b749388dd8029ed7de6208fdf557e91695 (patch) | |
tree | 2ae4dcc0bdf9567bb8dbc6e9905bb90696537d9a /OpenSim/Region | |
parent | Fixed the missing reference to a texture in TexturesAssetSet.xml , reported i... (diff) | |
download | opensim-SC-e7b3e7b749388dd8029ed7de6208fdf557e91695.zip opensim-SC-e7b3e7b749388dd8029ed7de6208fdf557e91695.tar.gz opensim-SC-e7b3e7b749388dd8029ed7de6208fdf557e91695.tar.bz2 opensim-SC-e7b3e7b749388dd8029ed7de6208fdf557e91695.tar.xz |
* Put in stub code for inventory backup.
* No user functionality yet (and not for quite some time)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 27 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 1 |
3 files changed, 32 insertions, 5 deletions
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 | |||
323 | case "save-oar": | 323 | case "save-oar": |
324 | SaveOar(cmdparams); | 324 | SaveOar(cmdparams); |
325 | break; | 325 | break; |
326 | |||
327 | case "save-inv": | ||
328 | SaveInv(cmdparams); | ||
329 | break; | ||
326 | 330 | ||
327 | case "plugin": | 331 | case "plugin": |
328 | m_sceneManager.SendCommandToPluginModules(cmdparams); | 332 | m_sceneManager.SendCommandToPluginModules(cmdparams); |
@@ -724,9 +728,13 @@ namespace OpenSim | |||
724 | } | 728 | } |
725 | } | 729 | } |
726 | 730 | ||
731 | /// <summary> | ||
732 | /// Load a whole region from an opensim archive. | ||
733 | /// </summary> | ||
734 | /// <param name="cmdparams"></param> | ||
727 | protected void LoadOar(string[] cmdparams) | 735 | protected void LoadOar(string[] cmdparams) |
728 | { | 736 | { |
729 | m_log.Warn("[CONSOLE]: Experimental functionality. Please don't rely on this."); | 737 | m_log.Warn("[CONSOLE]: Experimental functionality. Please don't rely on this yet."); |
730 | m_log.Warn("[CONSOLE]: See http://opensimulator.org/wiki/OpenSim_Archives for more details."); | 738 | m_log.Warn("[CONSOLE]: See http://opensimulator.org/wiki/OpenSim_Archives for more details."); |
731 | 739 | ||
732 | if (cmdparams.Length > 0) | 740 | if (cmdparams.Length > 0) |
@@ -739,9 +747,13 @@ namespace OpenSim | |||
739 | } | 747 | } |
740 | } | 748 | } |
741 | 749 | ||
750 | /// <summary> | ||
751 | /// Save a region to a file, including all the assets needed to restore it. | ||
752 | /// </summary> | ||
753 | /// <param name="cmdparams"></param> | ||
742 | protected void SaveOar(string[] cmdparams) | 754 | protected void SaveOar(string[] cmdparams) |
743 | { | 755 | { |
744 | m_log.Warn("[CONSOLE]: Experimental functionality. Please don't rely on this."); | 756 | m_log.Warn("[CONSOLE]: Experimental functionality. Please don't rely on this yet."); |
745 | m_log.Warn("[CONSOLE]: See http://opensimulator.org/wiki/OpenSim_Archives for more details."); | 757 | m_log.Warn("[CONSOLE]: See http://opensimulator.org/wiki/OpenSim_Archives for more details."); |
746 | 758 | ||
747 | if (cmdparams.Length > 0) | 759 | if (cmdparams.Length > 0) |
@@ -752,7 +764,16 @@ namespace OpenSim | |||
752 | { | 764 | { |
753 | m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); | 765 | m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME); |
754 | } | 766 | } |
755 | } | 767 | } |
768 | |||
769 | /// <summary> | ||
770 | /// Save inventory to a file. | ||
771 | /// </summary> | ||
772 | /// <param name="cmdparams"></param> | ||
773 | protected void SaveInv(string[] cmdparams) | ||
774 | { | ||
775 | m_log.Error("[CONSOLE]: This has not been implemented yet!"); | ||
776 | } | ||
756 | 777 | ||
757 | private static string CombineParams(string[] commandParams, int pos) | 778 | private static string CombineParams(string[] commandParams, int pos) |
758 | { | 779 | { |
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 | |||
62 | protected int proxyOffset = 0; | 62 | protected int proxyOffset = 0; |
63 | 63 | ||
64 | /// <summary> | 64 | /// <summary> |
65 | /// The file used to load and save prim backup xml if none has been specified | 65 | /// The file used to load and save prim backup xml if no filename has been specified |
66 | /// </summary> | 66 | /// </summary> |
67 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; | 67 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; |
68 | 68 | ||
69 | /// <summary> | 69 | /// <summary> |
70 | /// The file use to load and save an opensim archive if none has been specified | 70 | /// The file used to load and save an opensim archive if no filename has been specified |
71 | /// </summary> | 71 | /// </summary> |
72 | protected const string DEFAULT_OAR_BACKUP_FILENAME = "scene_oar.tar.gz"; | 72 | protected const string DEFAULT_OAR_BACKUP_FILENAME = "scene_oar.tar.gz"; |
73 | |||
74 | /// <summary> | ||
75 | /// The file to load and save inventory if no filename has been specified | ||
76 | /// </summary> | ||
77 | protected const string DEFAULT_INV_BACKUP_FILENAME = "opensim_inv.tar.gz"; | ||
73 | 78 | ||
74 | public string m_physicsEngine; | 79 | public string m_physicsEngine; |
75 | public string m_meshEngineName; | 80 | 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 | |||
1784 | } | 1784 | } |
1785 | } | 1785 | } |
1786 | } | 1786 | } |
1787 | |||
1787 | public LLUUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID AgentId) | 1788 | public LLUUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID AgentId) |
1788 | { | 1789 | { |
1789 | SceneObjectGroup objectGroup = grp; | 1790 | SceneObjectGroup objectGroup = grp; |