From e7934c9da0fff252017e35b74e214aae1f242819 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 11 Sep 2009 12:04:40 +0100
Subject: minor: correct my name in one of the library bundled scripts
---
bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml
index 6477a08..9641f7d 100644
--- a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml
+++ b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml
@@ -525,7 +525,7 @@
<Key Name="inventoryID" Value="81305ee4-8caa-9e0a-69a4-76ed57df0c8f" />
<Key Name="assetID" Value="81305ee4-8caa-9e0a-69a4-76ed57df0c8f" />
<Key Name="folderID" Value="284858c8-9391-6bf1-ddf5-b936f73de853" />
- <Key Name="description" Value="A text board that records what you say - contributed by Justin Clarke Casey" />
+ <Key Name="description" Value="A text board that records what you say - contributed by Justin Clark-Casey" />
<Key Name="name" Value="GrafittiBoard" />
<Key Name="assetType" Value="10" />
<Key Name="inventoryType" Value="10" />
--
cgit v1.1
From 212efc0c764210a8f0f2936b7802ecc04dbd5fd6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 11 Sep 2009 16:51:57 +0100
Subject: Remove bug where iar created folders could not be deleted after relog
New folders need to be created with AssetType.Unknown rather than
AssetType.Folder!
---
.../Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 8 ++++++--
.../Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 2 +-
2 files changed, 7 insertions(+), 3 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
string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
UUID newFolderId = UUID.Random();
-
+
+ // Asset type has to be Unknown here rather than Folder, otherwise the created folder can't be
+ // deleted once the client has relogged.
+ // The root folder appears to be labelled AssetType.Folder (shows up as "Category" in the client)
+ // even though there is a AssetType.RootCategory
destFolder
= new InventoryFolderBase(
newFolderId, newFolderName, m_userInfo.UserProfile.ID,
- (short)AssetType.Folder, destFolder.ID, 1);
+ (short)AssetType.Unknown, destFolder.ID, 1);
m_scene.InventoryService.AddFolder(destFolder);
// 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
id);
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1
From c573a32529a3c7fa3458da79c5caaed6662b7db6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 11 Sep 2009 20:38:08 +0100
Subject: Disable non-user ready load/save iar for now pending possible format
change
---
.../Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 12 ++++++++++--
1 file 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
scene.AddCommand(
this, "load iar",
"load iar <first> <last> <inventory path> [<archive path>]",
- "Load user inventory archive. EXPERIMENTAL, PLEASE DO NOT USE YET", HandleLoadInvConsoleCommand);
+ "Load user inventory archive. EXPERIMENTAL, CURRENTLY DISABLED", HandleLoadInvConsoleCommand);
scene.AddCommand(
this, "save iar",
"save iar <first> <last> <inventory path> [<archive path>]",
- "Save user inventory archive. EXPERIMENTAL, PLEASE DO NOT USE YET", HandleSaveInvConsoleCommand);
+ "Save user inventory archive. EXPERIMENTAL, CURRENTLY DISABLED", HandleSaveInvConsoleCommand);
m_aScene = scene;
}
@@ -233,6 +233,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
/// <param name="cmdparams"></param>
protected void HandleLoadInvConsoleCommand(string module, string[] cmdparams)
{
+ return;
+
+ /*
if (cmdparams.Length < 5)
{
m_log.Error(
@@ -253,6 +256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
m_log.InfoFormat(
"[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}",
loadPath, firstName, lastName);
+ */
}
/// <summary>
@@ -261,6 +265,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
/// <param name="cmdparams"></param>
protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams)
{
+ return;
+
+ /*
if (cmdparams.Length < 5)
{
m_log.Error(
@@ -282,6 +289,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
lock (m_pendingConsoleSaves)
m_pendingConsoleSaves.Add(id);
+ */
}
private void SaveInvConsoleCommandCompleted(
--
cgit v1.1