aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-12-21 19:15:44 -0500
committerTeravus Ovares (Dan Olivares)2010-12-21 19:15:44 -0500
commit25ecd62b1feed16d12d6f5e5ef00bddf7dbf0547 (patch)
tree6da8a5c79266eb5dc1e36baaf95ee1f0c8531f42 /OpenSim/Framework
parentWhat is the point of using different types to express the same damn thing? (diff)
downloadopensim-SC_OLD-25ecd62b1feed16d12d6f5e5ef00bddf7dbf0547.zip
opensim-SC_OLD-25ecd62b1feed16d12d6f5e5ef00bddf7dbf0547.tar.gz
opensim-SC_OLD-25ecd62b1feed16d12d6f5e5ef00bddf7dbf0547.tar.bz2
opensim-SC_OLD-25ecd62b1feed16d12d6f5e5ef00bddf7dbf0547.tar.xz
* Adds AbortXfer to the ClientAPI mix
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time. * Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes. * The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index b9c9323..6bca6eb 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1057,6 +1057,8 @@ namespace OpenSim.Framework
1057 1057
1058 void SendXferPacket(ulong xferID, uint packet, byte[] data); 1058 void SendXferPacket(ulong xferID, uint packet, byte[] data);
1059 1059
1060 void SendAbortXferPacket(ulong xferID);
1061
1060 void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, 1062 void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit,
1061 int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, 1063 int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent,
1062 float PriceObjectScaleFactor, 1064 float PriceObjectScaleFactor,