aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-11 19:57:45 +0000
committerJustin Clarke Casey2009-02-11 19:57:45 +0000
commit8645c7482d39ccc9d72cb4cfc7c68b651b3824d3 (patch)
tree56f5c0a371328eda49ed4c0fc97774762b8aaf42 /OpenSim/Region/ClientStack/LindenUDP
parent* Establish a common InventoryNodeBase class from InventoryItemBase and Inven... (diff)
downloadopensim-SC_OLD-8645c7482d39ccc9d72cb4cfc7c68b651b3824d3.zip
opensim-SC_OLD-8645c7482d39ccc9d72cb4cfc7c68b651b3824d3.tar.gz
opensim-SC_OLD-8645c7482d39ccc9d72cb4cfc7c68b651b3824d3.tar.bz2
opensim-SC_OLD-8645c7482d39ccc9d72cb4cfc7c68b651b3824d3.tar.xz
* Change SendBulkUpdateInventory from two methods to one which accepts an InventoryNode
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs26
1 files changed, 17 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index a1263a1..45915db 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1850,9 +1850,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1850 inventoryReply.Header.Zerocoded = true; 1850 inventoryReply.Header.Zerocoded = true;
1851 OutPacket(inventoryReply, ThrottleOutPacketType.Asset); 1851 OutPacket(inventoryReply, ThrottleOutPacketType.Asset);
1852 } 1852 }
1853 1853
1854 /// <see>IClientAPI.SendBulkUpdateInventory(InventoryFolderBase)</see> 1854 protected void SendBulkUpdateInventoryFolder(InventoryFolderBase folderBase)
1855 public void SendBulkUpdateInventory(InventoryFolderBase folderBase)
1856 { 1855 {
1857 // XXX: Nasty temporary move that will be resolved shortly 1856 // XXX: Nasty temporary move that will be resolved shortly
1858 InventoryFolderImpl folder = (InventoryFolderImpl)folderBase; 1857 InventoryFolderImpl folder = (InventoryFolderImpl)folderBase;
@@ -1863,7 +1862,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1863 List<BulkUpdateInventoryPacket.FolderDataBlock> folderDataBlocks 1862 List<BulkUpdateInventoryPacket.FolderDataBlock> folderDataBlocks
1864 = new List<BulkUpdateInventoryPacket.FolderDataBlock>(); 1863 = new List<BulkUpdateInventoryPacket.FolderDataBlock>();
1865 1864
1866 SendBulkUpdateInventoryRecursive(folder, ref folderDataBlocks, transactionId); 1865 SendBulkUpdateInventoryFolderRecursive(folder, ref folderDataBlocks, transactionId);
1867 1866
1868 if (folderDataBlocks.Count > 0) 1867 if (folderDataBlocks.Count > 0)
1869 { 1868 {
@@ -1888,7 +1887,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1888 /// <param name="folder"></param> 1887 /// <param name="folder"></param>
1889 /// <param name="folderDataBlocks"></param> 1888 /// <param name="folderDataBlocks"></param>
1890 /// <param name="transactionId"></param> 1889 /// <param name="transactionId"></param>
1891 private void SendBulkUpdateInventoryRecursive( 1890 private void SendBulkUpdateInventoryFolderRecursive(
1892 InventoryFolderImpl folder, ref List<BulkUpdateInventoryPacket.FolderDataBlock> folderDataBlocks, 1891 InventoryFolderImpl folder, ref List<BulkUpdateInventoryPacket.FolderDataBlock> folderDataBlocks,
1893 UUID transactionId) 1892 UUID transactionId)
1894 { 1893 {
@@ -1934,7 +1933,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1934 List<InventoryFolderImpl> subFolders = folder.RequestListOfFolderImpls(); 1933 List<InventoryFolderImpl> subFolders = folder.RequestListOfFolderImpls();
1935 foreach (InventoryFolderImpl subFolder in subFolders) 1934 foreach (InventoryFolderImpl subFolder in subFolders)
1936 { 1935 {
1937 SendBulkUpdateInventoryRecursive(subFolder, ref folderDataBlocks, transactionId); 1936 SendBulkUpdateInventoryFolderRecursive(subFolder, ref folderDataBlocks, transactionId);
1938 } 1937 }
1939 } 1938 }
1940 1939
@@ -1997,9 +1996,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1997 1996
1998 return itemBlock; 1997 return itemBlock;
1999 } 1998 }
2000 1999
2001 /// <see>IClientAPI.SendBulkUpdateInventory(InventoryItemBase)</see> 2000 public void SendBulkUpdateInventory(InventoryNodeBase node)
2002 public void SendBulkUpdateInventory(InventoryItemBase item) 2001 {
2002 if (node is InventoryItemBase)
2003 SendBulkUpdateInventoryItem((InventoryItemBase)node);
2004 else if (node is InventoryFolderBase)
2005 SendBulkUpdateInventoryFolder((InventoryFolderBase)node);
2006 else
2007 m_log.ErrorFormat("[CLIENT]: Client for {0} sent unknown inventory node named {1}", Name, node.Name);
2008 }
2009
2010 protected void SendBulkUpdateInventoryItem(InventoryItemBase item)
2003 { 2011 {
2004 const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; 2012 const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
2005 2013