aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-04 19:57:36 +0000
committerJustin Clarke Casey2008-12-04 19:57:36 +0000
commit38ca31b37a6ac8fe74b77e4488112eb77d612827 (patch)
tree01c75a28b9f34667910f0992d8f817a5c5a1e5b3 /OpenSim/Framework
parentMinor formatting cleanup. (diff)
downloadopensim-SC_OLD-38ca31b37a6ac8fe74b77e4488112eb77d612827.zip
opensim-SC_OLD-38ca31b37a6ac8fe74b77e4488112eb77d612827.tar.gz
opensim-SC_OLD-38ca31b37a6ac8fe74b77e4488112eb77d612827.tar.bz2
opensim-SC_OLD-38ca31b37a6ac8fe74b77e4488112eb77d612827.tar.xz
* Put in the code necessary to allow inventory transfer of whole folders (and their contents) between agents, not just single items
* However, this is not currently activated since it's not absolutely fully tested and there's a bug lurking in there to do with the sending of the BulkInventoryUpdate packets
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs5
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs7
3 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 4212fbc..b4e7bfa 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -556,8 +556,10 @@ namespace OpenSim.Framework.Communications.Cache
556 } 556 }
557 557
558 /// <summary> 558 /// <summary>
559 /// Add an item to the user's inventory 559 /// Add an item to the user's inventory.
560 /// </summary> 560 /// </summary>
561 /// If the item has no folder set (i.e. it is UUID.Zero), then it is placed in the most appropriate folder
562 /// for that type.
561 /// <param name="itemInfo"></param> 563 /// <param name="itemInfo"></param>
562 public void AddItem(InventoryItemBase item) 564 public void AddItem(InventoryItemBase item)
563 { 565 {
@@ -572,6 +574,7 @@ namespace OpenSim.Framework.Communications.Cache
572 item.Folder = RootFolder.ID; 574 item.Folder = RootFolder.ID;
573 } 575 }
574 ItemReceive(item, null); 576 ItemReceive(item, null);
577
575 if (m_commsManager.SecureInventoryService != null) 578 if (m_commsManager.SecureInventoryService != null)
576 { 579 {
577 m_commsManager.SecureInventoryService.AddItem(item, m_session_id); 580 m_commsManager.SecureInventoryService.AddItem(item, m_session_id);
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 8e624f9..0704232 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -358,6 +358,10 @@ namespace OpenSim.Framework.Communications.Cache
358 return folderList; 358 return folderList;
359 } 359 }
360 360
361 /// <value>
362 /// The total number of items in this folder and in the immediate child folders (though not from other
363 /// descendants).
364 /// </value>
361 public int TotalCount 365 public int TotalCount
362 { 366 {
363 get 367 get
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 15a89d3..8a3c4b6 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -829,6 +829,13 @@ namespace OpenSim.Framework
829 void SendTaskInventory(UUID taskID, short serial, byte[] fileName); 829 void SendTaskInventory(UUID taskID, short serial, byte[] fileName);
830 830
831 /// <summary> 831 /// <summary>
832 /// Used by the server to inform the client of new inventory items. Will transfer the contents of the folder
833 /// (including all descendent folders) as well as the folder itself.
834 /// </summary>
835 /// <param name="folder"></param>
836 void SendBulkUpdateInventory(InventoryFolderBase folder);
837
838 /// <summary>
832 /// Used by the server to inform the client of a new inventory item. Used when transferring items 839 /// Used by the server to inform the client of a new inventory item. Used when transferring items
833 /// between avatars, possibly among other things. 840 /// between avatars, possibly among other things.
834 /// </summary> 841 /// </summary>