diff options
| author | John Hurliman | 2009-11-04 16:08:23 -0800 |
|---|---|---|
| committer | John Hurliman | 2009-11-04 16:08:23 -0800 |
| commit | f57a646638340063e22d1f38c37502afaf963137 (patch) | |
| tree | ea109f74119cf552805c601bd13d3a2a697cd9a5 /OpenSim/Framework/Communications | |
| parent | Removing EntityBase.Rotation (diff) | |
| parent | Add some length to the backet buffer for packet sending so oversize (diff) | |
| download | opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.zip opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.tar.gz opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.tar.bz2 opensim-SC_OLD-f57a646638340063e22d1f38c37502afaf963137.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Communications')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index aa71536..6648c36 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
| @@ -679,7 +679,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 679 | /// <param name="fetchFolders"></param> | 679 | /// <param name="fetchFolders"></param> |
| 680 | /// <param name="fetchItems"></param> | 680 | /// <param name="fetchItems"></param> |
| 681 | /// <returns>true if the request was queued or successfully processed, false otherwise</returns> | 681 | /// <returns>true if the request was queued or successfully processed, false otherwise</returns> |
| 682 | public bool SendInventoryDecendents(IClientAPI client, UUID folderID, bool fetchFolders, bool fetchItems) | 682 | public bool SendInventoryDecendents(IClientAPI client, UUID folderID, int version, bool fetchFolders, bool fetchItems) |
| 683 | { | 683 | { |
| 684 | if (m_hasReceivedInventory) | 684 | if (m_hasReceivedInventory) |
| 685 | { | 685 | { |
| @@ -693,7 +693,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 693 | 693 | ||
| 694 | client.SendInventoryFolderDetails( | 694 | client.SendInventoryFolderDetails( |
| 695 | client.AgentId, folderID, folder.RequestListOfItems(), | 695 | client.AgentId, folderID, folder.RequestListOfItems(), |
| 696 | folder.RequestListOfFolders(), fetchFolders, fetchItems); | 696 | folder.RequestListOfFolders(), version, fetchFolders, fetchItems); |
| 697 | 697 | ||
| 698 | return true; | 698 | return true; |
| 699 | } | 699 | } |