aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorTom Grimshaw2010-07-03 09:22:58 -0700
committerTom Grimshaw2010-07-03 09:22:58 -0700
commit4cd5e642319b31e1da838ca6fda97ae2992b2c79 (patch)
tree2a331cb3c4e1f72060574760d42f7c1f46d0e3c9 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-4cd5e642319b31e1da838ca6fda97ae2992b2c79.zip
opensim-SC_OLD-4cd5e642319b31e1da838ca6fda97ae2992b2c79.tar.gz
opensim-SC_OLD-4cd5e642319b31e1da838ca6fda97ae2992b2c79.tar.bz2
opensim-SC_OLD-4cd5e642319b31e1da838ca6fda97ae2992b2c79.tar.xz
Use SendTransferAbort in a more sensible place
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 14b716b..4dfd5d1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -11511,12 +11511,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11511 11511
11512// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID); 11512// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
11513 11513
11514 if (!m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived)) 11514
11515 { 11515 //Note, the bool returned from the below function is useless since it is always false.
11516 //We need to send a TransferAbort here, so the client doesn't wait forever for the asset, 11516 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
11517 //which causes it to not request any more for a while. Which is bad. 11517
11518 SendTransferAbort(transferRequest);
11519 }
11520 } 11518 }
11521 11519
11522 /// <summary> 11520 /// <summary>
@@ -11565,8 +11563,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11565 } 11563 }
11566 11564
11567 //m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing. Dropping", requestID); 11565 //m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing. Dropping", requestID);
11568 11566
11569 // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right. 11567 //We need to send a TransferAbort here, so the client doesn't wait forever for the asset,
11568 //which causes it to not request any more for a while. Which is bad.
11569 SendTransferAbort(transferRequest);
11570 return; 11570 return;
11571 } 11571 }
11572 11572