diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 4d96b28..00faabb 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, CURRENTLY DISABLED", HandleLoadInvConsoleCommand); | 95 | "Load user inventory archive. EXPERIMENTAL", 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, CURRENTLY DISABLED", HandleSaveInvConsoleCommand); | 100 | "Save user inventory archive. EXPERIMENTAL", HandleSaveInvConsoleCommand); |
101 | 101 | ||
102 | m_aScene = scene; | 102 | m_aScene = scene; |
103 | } | 103 | } |
@@ -233,9 +233,6 @@ 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 | /* | ||
239 | if (cmdparams.Length < 5) | 236 | if (cmdparams.Length < 5) |
240 | { | 237 | { |
241 | m_log.Error( | 238 | m_log.Error( |
@@ -243,6 +240,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
243 | return; | 240 | return; |
244 | } | 241 | } |
245 | 242 | ||
243 | m_log.Info("[INVENTORY ARCHIVER]: PLEASE NOTE THAT THIS FACILITY IS EXPERIMENTAL. BUG REPORTS WELCOME."); | ||
244 | |||
246 | string firstName = cmdparams[2]; | 245 | string firstName = cmdparams[2]; |
247 | string lastName = cmdparams[3]; | 246 | string lastName = cmdparams[3]; |
248 | string invPath = cmdparams[4]; | 247 | string invPath = cmdparams[4]; |
@@ -256,7 +255,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
256 | m_log.InfoFormat( | 255 | m_log.InfoFormat( |
257 | "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}", | 256 | "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}", |
258 | loadPath, firstName, lastName); | 257 | loadPath, firstName, lastName); |
259 | */ | ||
260 | } | 258 | } |
261 | 259 | ||
262 | /// <summary> | 260 | /// <summary> |
@@ -265,9 +263,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
265 | /// <param name="cmdparams"></param> | 263 | /// <param name="cmdparams"></param> |
266 | protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams) | 264 | protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams) |
267 | { | 265 | { |
268 | return; | ||
269 | |||
270 | /* | ||
271 | if (cmdparams.Length < 5) | 266 | if (cmdparams.Length < 5) |
272 | { | 267 | { |
273 | m_log.Error( | 268 | m_log.Error( |
@@ -275,6 +270,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
275 | return; | 270 | return; |
276 | } | 271 | } |
277 | 272 | ||
273 | m_log.Info("[INVENTORY ARCHIVER]: PLEASE NOTE THAT THIS FACILITY IS EXPERIMENTAL. BUG REPORTS WELCOME."); | ||
274 | |||
278 | string firstName = cmdparams[2]; | 275 | string firstName = cmdparams[2]; |
279 | string lastName = cmdparams[3]; | 276 | string lastName = cmdparams[3]; |
280 | string invPath = cmdparams[4]; | 277 | string invPath = cmdparams[4]; |
@@ -289,7 +286,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
289 | 286 | ||
290 | lock (m_pendingConsoleSaves) | 287 | lock (m_pendingConsoleSaves) |
291 | m_pendingConsoleSaves.Add(id); | 288 | m_pendingConsoleSaves.Add(id); |
292 | */ | ||
293 | } | 289 | } |
294 | 290 | ||
295 | private void SaveInvConsoleCommandCompleted( | 291 | private void SaveInvConsoleCommandCompleted( |