diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 9f29420..ecfc68f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -11496,33 +11496,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11496 | //m_log.Debug("asset request " + requestID); | 11496 | //m_log.Debug("asset request " + requestID); |
11497 | } | 11497 | } |
11498 | 11498 | ||
11499 | if (null == asset) | ||
11500 | { | ||
11501 | if ((m_hyperAssets != null) && (transferRequest.TransferInfo.SourceType < 2000)) | ||
11502 | { | ||
11503 | // Try the user's inventory, but only if it's different from the regions' | ||
11504 | string userAssets = m_hyperAssets.GetUserAssetServer(AgentId); | ||
11505 | if ((userAssets != string.Empty) && (userAssets != m_hyperAssets.GetSimAssetServer())) | ||
11506 | { | ||
11507 | m_log.DebugFormat("[CLIENT]: asset {0} not found in local asset storage. Trying user's storage.", id); | ||
11508 | if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset) | ||
11509 | transferRequest.TransferInfo.SourceType = 2222; // marker | ||
11510 | else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem) | ||
11511 | transferRequest.TransferInfo.SourceType = 3333; // marker | ||
11512 | |||
11513 | m_assetService.Get(userAssets + "/" + id, transferRequest, AssetReceived); | ||
11514 | return; | ||
11515 | } | ||
11516 | } | ||
11517 | |||
11518 | //m_log.DebugFormat("[ASSET CACHE]: Asset transfer request for asset which is {0} already known to be missing. Dropping", requestID); | ||
11519 | |||
11520 | //We need to send a TransferAbort here, so the client doesn't wait forever for the asset, | ||
11521 | //which causes it to not request any more for a while. Which is bad. | ||
11522 | SendTransferAbort(transferRequest); | ||
11523 | return; | ||
11524 | } | ||
11525 | |||
11526 | // Scripts cannot be retrieved by direct request | 11499 | // Scripts cannot be retrieved by direct request |
11527 | if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset && asset.Type == 10) | 11500 | if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset && asset.Type == 10) |
11528 | return; | 11501 | return; |