diff options
author | Teravus Ovares (Dan Olivares) | 2010-12-21 19:15:44 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-12-21 19:15:44 -0500 |
commit | 25ecd62b1feed16d12d6f5e5ef00bddf7dbf0547 (patch) | |
tree | 6da8a5c79266eb5dc1e36baaf95ee1f0c8531f42 /OpenSim/Region/ClientStack/LindenUDP | |
parent | What is the point of using different types to express the same damn thing? (diff) | |
download | opensim-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/Region/ClientStack/LindenUDP')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 63469c8..929f282 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2078,6 +2078,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2078 | OutPacket(sendXfer, ThrottleOutPacketType.Asset); | 2078 | OutPacket(sendXfer, ThrottleOutPacketType.Asset); |
2079 | } | 2079 | } |
2080 | 2080 | ||
2081 | public void SendAbortXferPacket(ulong xferID) | ||
2082 | { | ||
2083 | AbortXferPacket xferItem = (AbortXferPacket)PacketPool.Instance.GetPacket(PacketType.AbortXfer); | ||
2084 | xferItem.XferID.ID = xferID; | ||
2085 | OutPacket(xferItem, ThrottleOutPacketType.Asset); | ||
2086 | } | ||
2087 | |||
2081 | public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, | 2088 | public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, |
2082 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, | 2089 | int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, |
2083 | int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, | 2090 | int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, |