From 92561aef8dd1658bc29e5f9458c94407be7da582 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 3 May 2010 23:44:23 +0200
Subject: Store given items in correct parent folder. Fixes items given to
offline avatars not getting lost.
---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9117224..20760b2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -415,6 +415,25 @@ namespace OpenSim.Region.Framework.Scenes
itemCopy.BasePermissions = item.BasePermissions;
}
+ if (itemCopy.Folder == UUID.Zero)
+ {
+ InventoryFolderBase folder = InventoryService.GetFolderForType(recipient, (AssetType)itemCopy.AssetType);
+
+ if (folder != null)
+ {
+ itemCopy.Folder = folder.ID;
+ }
+ else
+ {
+ InventoryFolderBase root = InventoryService.GetRootFolder(recipient);
+
+ if (root != null)
+ itemCopy.Folder = root.ID;
+ else
+ return null; // No destination
+ }
+ }
+
itemCopy.GroupID = UUID.Zero;
itemCopy.GroupOwned = false;
itemCopy.Flags = item.Flags;
--
cgit v1.1