OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Melanie Thielker 2010-07-03 20:29:06 +02:00
parent edcfaf60c9 4cd5e64231
commit baa20a10c3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -11511,12 +11511,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID);
if (!m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived))
{
//We need to send a TransferAbort here, so the client doesn't wait forever for the asset,
//which causes it to not request any more for a while. Which is bad.
SendTransferAbort(transferRequest);
}
//Note, the bool returned from the below function is useless since it is always false.
m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
}
/// <summary>
@ -11566,7 +11564,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing. Dropping", requestID);
// FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right.
//We need to send a TransferAbort here, so the client doesn't wait forever for the asset,
//which causes it to not request any more for a while. Which is bad.
SendTransferAbort(transferRequest);
return;
}