diff options
author | Justin Clark-Casey (justincc) | 2009-09-11 20:38:08 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-11 20:38:08 +0100 |
commit | c573a32529a3c7fa3458da79c5caaed6662b7db6 (patch) | |
tree | 9dfb9c6f2ecb9995e7f9d8408d24b749cb314c85 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-c573a32529a3c7fa3458da79c5caaed6662b7db6.zip opensim-SC_OLD-c573a32529a3c7fa3458da79c5caaed6662b7db6.tar.gz opensim-SC_OLD-c573a32529a3c7fa3458da79c5caaed6662b7db6.tar.bz2 opensim-SC_OLD-c573a32529a3c7fa3458da79c5caaed6662b7db6.tar.xz |
Disable non-user ready load/save iar for now pending possible format change
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 2340fad..4d96b28 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -92,12 +92,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
92 | scene.AddCommand( | 92 | scene.AddCommand( |
93 | this, "load iar", | 93 | this, "load iar", |
94 | "load iar <first> <last> <inventory path> [<archive path>]", | 94 | "load iar <first> <last> <inventory path> [<archive path>]", |
95 | "Load user inventory archive. EXPERIMENTAL, PLEASE DO NOT USE YET", HandleLoadInvConsoleCommand); | 95 | "Load user inventory archive. EXPERIMENTAL, CURRENTLY DISABLED", HandleLoadInvConsoleCommand); |
96 | 96 | ||
97 | scene.AddCommand( | 97 | scene.AddCommand( |
98 | this, "save iar", | 98 | this, "save iar", |
99 | "save iar <first> <last> <inventory path> [<archive path>]", | 99 | "save iar <first> <last> <inventory path> [<archive path>]", |
100 | "Save user inventory archive. EXPERIMENTAL, PLEASE DO NOT USE YET", HandleSaveInvConsoleCommand); | 100 | "Save user inventory archive. EXPERIMENTAL, CURRENTLY DISABLED", HandleSaveInvConsoleCommand); |
101 | 101 | ||
102 | m_aScene = scene; | 102 | m_aScene = scene; |
103 | } | 103 | } |
@@ -233,6 +233,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
233 | /// <param name="cmdparams"></param> | 233 | /// <param name="cmdparams"></param> |
234 | protected void HandleLoadInvConsoleCommand(string module, string[] cmdparams) | 234 | protected void HandleLoadInvConsoleCommand(string module, string[] cmdparams) |
235 | { | 235 | { |
236 | return; | ||
237 | |||
238 | /* | ||
236 | if (cmdparams.Length < 5) | 239 | if (cmdparams.Length < 5) |
237 | { | 240 | { |
238 | m_log.Error( | 241 | m_log.Error( |
@@ -253,6 +256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
253 | m_log.InfoFormat( | 256 | m_log.InfoFormat( |
254 | "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}", | 257 | "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}", |
255 | loadPath, firstName, lastName); | 258 | loadPath, firstName, lastName); |
259 | */ | ||
256 | } | 260 | } |
257 | 261 | ||
258 | /// <summary> | 262 | /// <summary> |
@@ -261,6 +265,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
261 | /// <param name="cmdparams"></param> | 265 | /// <param name="cmdparams"></param> |
262 | protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams) | 266 | protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams) |
263 | { | 267 | { |
268 | return; | ||
269 | |||
270 | /* | ||
264 | if (cmdparams.Length < 5) | 271 | if (cmdparams.Length < 5) |
265 | { | 272 | { |
266 | m_log.Error( | 273 | m_log.Error( |
@@ -282,6 +289,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
282 | 289 | ||
283 | lock (m_pendingConsoleSaves) | 290 | lock (m_pendingConsoleSaves) |
284 | m_pendingConsoleSaves.Add(id); | 291 | m_pendingConsoleSaves.Add(id); |
292 | */ | ||
285 | } | 293 | } |
286 | 294 | ||
287 | private void SaveInvConsoleCommandCompleted( | 295 | private void SaveInvConsoleCommandCompleted( |