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/Client | |
| 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/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 204603d..3c3c247 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -1052,7 +1052,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 1052 | { | 1052 | { |
| 1053 | } | 1053 | } |
| 1054 | 1054 | ||
| 1055 | public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems) | 1055 | public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems) |
| 1056 | { | 1056 | { |
| 1057 | // Need to translate to MXP somehow | 1057 | // Need to translate to MXP somehow |
| 1058 | } | 1058 | } |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 4a54c67..81ebf31 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -606,7 +606,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 606 | throw new System.NotImplementedException(); | 606 | throw new System.NotImplementedException(); |
| 607 | } | 607 | } |
| 608 | 608 | ||
| 609 | public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems) | 609 | public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems) |
| 610 | { | 610 | { |
| 611 | throw new System.NotImplementedException(); | 611 | throw new System.NotImplementedException(); |
| 612 | } | 612 | } |