aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie Thielker2009-03-22 15:42:22 +0000
committerMelanie Thielker2009-03-22 15:42:22 +0000
commite6bb86a22428c6ed9e3d97e5347835e5e5cff598 (patch)
treee4c82542e73b0e048f0f0d1c3b6352515f4ad326 /OpenSim/Region/CoreModules
parentFox a null ref in the inventory give module (diff)
downloadopensim-SC_OLD-e6bb86a22428c6ed9e3d97e5347835e5e5cff598.zip
opensim-SC_OLD-e6bb86a22428c6ed9e3d97e5347835e5e5cff598.tar.gz
opensim-SC_OLD-e6bb86a22428c6ed9e3d97e5347835e5e5cff598.tar.bz2
opensim-SC_OLD-e6bb86a22428c6ed9e3d97e5347835e5e5cff598.tar.xz
Add QueryItem method to secure inventory and HG inventory, change method sig to
provide additional information the HG needs.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 147d453..465167a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -433,10 +433,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
433 else 433 else
434 { 434 {
435 UUID itemID = new UUID(msg.binaryBucket, 1); 435 UUID itemID = new UUID(msg.binaryBucket, 1);
436 InventoryItemBase item = new InventoryItemBase();
437
438 item.ID = itemID;
439 item.Owner = user.ControllingClient.AgentId;
436 440
437 // Fetch from database 441 // Fetch from database
438 // 442 //
439 if (!userInfo.QueryItem(itemID)) 443 if (!userInfo.QueryItem(item))
440 { 444 {
441 m_log.Debug("[INVENTORY TRANSFER] Can't find item to give"); 445 m_log.Debug("[INVENTORY TRANSFER] Can't find item to give");
442 return; 446 return;
@@ -444,7 +448,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
444 448
445 // Get item info 449 // Get item info
446 // 450 //
447 InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); 451 item = userInfo.RootFolder.FindItem(item.ID);
448 if (item == null) 452 if (item == null)
449 { 453 {
450 m_log.Debug("[INVENTORY TRANSFER] Can't retrieve item to give"); 454 m_log.Debug("[INVENTORY TRANSFER] Can't retrieve item to give");