diff options
| author | Melanie | 2012-07-20 09:35:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-20 09:35:22 +0100 |
| commit | df866fd300b94e43326e0b8e194055b5c6cf2afe (patch) | |
| tree | f84db3b1e03d14488eedb078546c3d174ff8857c /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC-df866fd300b94e43326e0b8e194055b5c6cf2afe.zip opensim-SC-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.gz opensim-SC-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.bz2 opensim-SC-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 58a65de..b1f41b8 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1177,7 +1177,7 @@ namespace OpenSim.Framework | |||
| 1177 | /// <param name="node"></param> | 1177 | /// <param name="node"></param> |
| 1178 | void SendBulkUpdateInventory(InventoryNodeBase node); | 1178 | void SendBulkUpdateInventory(InventoryNodeBase node); |
| 1179 | 1179 | ||
| 1180 | void SendXferPacket(ulong xferID, uint packet, byte[] data); | 1180 | void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory); |
| 1181 | 1181 | ||
| 1182 | void SendAbortXferPacket(ulong xferID); | 1182 | void SendAbortXferPacket(ulong xferID); |
| 1183 | 1183 | ||