aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorubit2012-07-23 20:18:07 +0200
committerubit2012-07-23 20:18:07 +0200
commit23be64c1324ddbf997bcc791192284be75506e2a (patch)
tree725d0a6ef44b4625fd71821554c5ea7a4c794f15 /OpenSim/Framework
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentFix double-ping on logout by not sending a stop packet to the client (diff)
downloadopensim-SC-23be64c1324ddbf997bcc791192284be75506e2a.zip
opensim-SC-23be64c1324ddbf997bcc791192284be75506e2a.tar.gz
opensim-SC-23be64c1324ddbf997bcc791192284be75506e2a.tar.bz2
opensim-SC-23be64c1324ddbf997bcc791192284be75506e2a.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
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