diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index ae5cbff..4d6081c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -11955,21 +11955,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11955 | protected void MakeAssetRequest(TransferRequestPacket transferRequest, UUID taskID) | 11955 | protected void MakeAssetRequest(TransferRequestPacket transferRequest, UUID taskID) |
11956 | { | 11956 | { |
11957 | UUID requestID = UUID.Zero; | 11957 | UUID requestID = UUID.Zero; |
11958 | if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset) | 11958 | int sourceType = transferRequest.TransferInfo.SourceType; |
11959 | |||
11960 | if (sourceType == (int)SourceType.Asset) | ||
11959 | { | 11961 | { |
11960 | requestID = new UUID(transferRequest.TransferInfo.Params, 0); | 11962 | requestID = new UUID(transferRequest.TransferInfo.Params, 0); |
11961 | } | 11963 | } |
11962 | else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem) | 11964 | else if (sourceType == (int)SourceType.SimInventoryItem) |
11963 | { | 11965 | { |
11964 | requestID = new UUID(transferRequest.TransferInfo.Params, 80); | 11966 | requestID = new UUID(transferRequest.TransferInfo.Params, 80); |
11965 | } | 11967 | } |
11966 | else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimEstate) | 11968 | else if (sourceType == (int)SourceType.SimEstate) |
11967 | { | 11969 | { |
11968 | requestID = taskID; | 11970 | requestID = taskID; |
11969 | } | 11971 | } |
11970 | 11972 | ||
11971 | 11973 | // m_log.DebugFormat( | |
11972 | // m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID); | 11974 | // "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}", |
11975 | // requestID, taskID, (SourceType)sourceType, Name); | ||
11973 | 11976 | ||
11974 | m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); | 11977 | m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); |
11975 | } | 11978 | } |