From 25ecd62b1feed16d12d6f5e5ef00bddf7dbf0547 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Tue, 21 Dec 2010 19:15:44 -0500
Subject: * 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.
---
OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 6 ++++++
OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 5 +++++
2 files changed, 11 insertions(+)
(limited to 'OpenSim/Client')
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 19331c6..a66caab 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1116,6 +1116,12 @@ namespace OpenSim.Client.MXP.ClientStack
// SL Specific, Ignore. (Remove from IClient)
}
+ public void SendAbortXferPacket(ulong xferID)
+ {
+
+ }
+
+
public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent)
{
// SL Specific, Ignore. (Remove from IClient)
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 0d23232..c8eca9f 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -669,6 +669,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
throw new System.NotImplementedException();
}
+ public virtual void SendAbortXferPacket(ulong xferID)
+ {
+ throw new System.NotImplementedException();
+ }
+
public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent)
{
throw new System.NotImplementedException();
--
cgit v1.1