aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs21
1 files changed, 15 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 0b545c4..9f0ac4f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -77,16 +77,20 @@ namespace OpenSim.Region.Framework.Scenes
77 } 77 }
78 78
79 /// <summary> 79 /// <summary>
80 /// Add an inventory item to a prim in this group. 80 /// Add an inventory item from a user's inventory to a prim in this scene object.
81 /// </summary> 81 /// </summary>
82 /// <param name="remoteClient"></param> 82 /// <param name="remoteClient">The client adding the item.</param>
83 /// <param name="localID"></param> 83 /// <param name="localID">The local ID of the part receiving the add.</param>
84 /// <param name="item"></param> 84 /// <param name="item">The user inventory item being added.</param>
85 /// <param name="copyItemID">The item UUID that should be used by the new item.</param> 85 /// <param name="copyItemID">The item UUID that should be used by the new item.</param>
86 /// <returns></returns> 86 /// <returns></returns>
87 public bool AddInventoryItem(IClientAPI remoteClient, uint localID, 87 public bool AddInventoryItem(IClientAPI remoteClient, uint localID,
88 InventoryItemBase item, UUID copyItemID) 88 InventoryItemBase item, UUID copyItemID)
89 { 89 {
90// m_log.DebugFormat(
91// "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}",
92// item.Name, remoteClient.Name, localID);
93
90 UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID; 94 UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID;
91 95
92 SceneObjectPart part = GetChildPart(localID); 96 SceneObjectPart part = GetChildPart(localID);
@@ -128,15 +132,20 @@ namespace OpenSim.Region.Framework.Scenes
128 taskItem.GroupPermissions = item.GroupPermissions; 132 taskItem.GroupPermissions = item.GroupPermissions;
129 taskItem.NextPermissions = item.NextPermissions; 133 taskItem.NextPermissions = item.NextPermissions;
130 } 134 }
131 135
132 taskItem.Flags = item.Flags; 136 taskItem.Flags = item.Flags;
137
138// m_log.DebugFormat(
139// "[PRIM INVENTORY]: Flags are 0x{0:X} for item {1} added to part {2} by {3}",
140// taskItem.Flags, taskItem.Name, localID, remoteClient.Name);
141
133 // TODO: These are pending addition of those fields to TaskInventoryItem 142 // TODO: These are pending addition of those fields to TaskInventoryItem
134// taskItem.SalePrice = item.SalePrice; 143// taskItem.SalePrice = item.SalePrice;
135// taskItem.SaleType = item.SaleType; 144// taskItem.SaleType = item.SaleType;
136 taskItem.CreationDate = (uint)item.CreationDate; 145 taskItem.CreationDate = (uint)item.CreationDate;
137 146
138 bool addFromAllowedDrop = false; 147 bool addFromAllowedDrop = false;
139 if (remoteClient!=null) 148 if (remoteClient != null)
140 { 149 {
141 addFromAllowedDrop = remoteClient.AgentId != part.OwnerID; 150 addFromAllowedDrop = remoteClient.AgentId != part.OwnerID;
142 } 151 }