aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-09-11 12:55:25 -0700
committerDiva Canto2009-09-11 12:55:25 -0700
commit8fd604dcd4edb588d4925ea14e1eb9f210dac15e (patch)
treec962d10d1d8a7f3ce2185edb5bec13a776e7e80e /OpenSim
parentChanged names of methods in IGridService. (diff)
parentDisable non-user ready load/save iar for now pending possible format change (diff)
downloadopensim-SC_OLD-8fd604dcd4edb588d4925ea14e1eb9f210dac15e.zip
opensim-SC_OLD-8fd604dcd4edb588d4925ea14e1eb9f210dac15e.tar.gz
opensim-SC_OLD-8fd604dcd4edb588d4925ea14e1eb9f210dac15e.tar.bz2
opensim-SC_OLD-8fd604dcd4edb588d4925ea14e1eb9f210dac15e.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs8
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs12
3 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 0441215..907e2d4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -290,11 +290,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
290 290
291 string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex); 291 string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
292 UUID newFolderId = UUID.Random(); 292 UUID newFolderId = UUID.Random();
293 293
294 // Asset type has to be Unknown here rather than Folder, otherwise the created folder can't be
295 // deleted once the client has relogged.
296 // The root folder appears to be labelled AssetType.Folder (shows up as "Category" in the client)
297 // even though there is a AssetType.RootCategory
294 destFolder 298 destFolder
295 = new InventoryFolderBase( 299 = new InventoryFolderBase(
296 newFolderId, newFolderName, m_userInfo.UserProfile.ID, 300 newFolderId, newFolderName, m_userInfo.UserProfile.ID,
297 (short)AssetType.Folder, destFolder.ID, 1); 301 (short)AssetType.Unknown, destFolder.ID, 1);
298 m_scene.InventoryService.AddFolder(destFolder); 302 m_scene.InventoryService.AddFolder(destFolder);
299 303
300// UUID newFolderId = UUID.Random(); 304// UUID newFolderId = UUID.Random();
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index b178772..7b4a9eb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -410,4 +410,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
410 id); 410 id);
411 } 411 }
412 } 412 }
413} 413} \ No newline at end of file
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(