aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-03-22 18:25:04 +0000
committerMelanie Thielker2009-03-22 18:25:04 +0000
commit48e87b644838ad0b59d6dfe7c3fddf4b96cf4971 (patch)
tree075e8781c93e6503f15a16349656068712364d46 /OpenSim
parentMYSQL Only: Make items given while offline appear in inventory without (diff)
downloadopensim-SC_OLD-48e87b644838ad0b59d6dfe7c3fddf4b96cf4971.zip
opensim-SC_OLD-48e87b644838ad0b59d6dfe7c3fddf4b96cf4971.tar.gz
opensim-SC_OLD-48e87b644838ad0b59d6dfe7c3fddf4b96cf4971.tar.bz2
opensim-SC_OLD-48e87b644838ad0b59d6dfe7c3fddf4b96cf4971.tar.xz
Make single item inventory gives work across regions
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
2 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 4ea1e22..e590b9d 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -790,11 +790,11 @@ namespace OpenSim.Framework.Communications.Cache
790 790
791 if (m_commsManager.SecureInventoryService != null) 791 if (m_commsManager.SecureInventoryService != null)
792 { 792 {
793 m_commsManager.SecureInventoryService.QueryItem(item, m_session_id); 793 itemInfo = m_commsManager.SecureInventoryService.QueryItem(item, m_session_id);
794 } 794 }
795 else 795 else
796 { 796 {
797 m_commsManager.InventoryService.QueryItem(item); 797 itemInfo = m_commsManager.InventoryService.QueryItem(item);
798 } 798 }
799 799
800 if (itemInfo != null) 800 if (itemInfo != null)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 011d9a6..9528114 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -525,8 +525,6 @@ namespace OpenSim.Region.Framework.Scenes
525 itemCopy.SalePrice = item.SalePrice; 525 itemCopy.SalePrice = item.SalePrice;
526 itemCopy.SaleType = item.SaleType; 526 itemCopy.SaleType = item.SaleType;
527 527
528 itemCopy.CreationDate = item.CreationDate;
529
530 recipientUserInfo.AddItem(itemCopy); 528 recipientUserInfo.AddItem(itemCopy);
531 529
532 if (!Permissions.BypassPermissions()) 530 if (!Permissions.BypassPermissions())