diff options
author | Justin Clark-Casey (justincc) | 2012-02-10 23:39:59 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-10 23:39:59 +0000 |
commit | 38f878952c5177742185b5d0be6cb393a752d085 (patch) | |
tree | 8c0939d6f911298fa634d416a74aaf87ae7b2c7e /OpenSim/Region | |
parent | Add line numbers to Util.PrintCallStack() (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-38f878952c5177742185b5d0be6cb393a752d085.zip opensim-SC-38f878952c5177742185b5d0be6cb393a752d085.tar.gz opensim-SC-38f878952c5177742185b5d0be6cb393a752d085.tar.bz2 opensim-SC-38f878952c5177742185b5d0be6cb393a752d085.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index ff96f4d..d98ff68 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -7625,6 +7625,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7625 | } | 7625 | } |
7626 | } | 7626 | } |
7627 | } | 7627 | } |
7628 | else | ||
7629 | if (transfer.TransferInfo.SourceType == (int)SourceType.SimEstate) | ||
7630 | { | ||
7631 | //TransferRequestPacket does not include covenant uuid? | ||
7632 | //get scene covenant uuid | ||
7633 | taskID = m_scene.RegionInfo.RegionSettings.Covenant; | ||
7634 | } | ||
7628 | 7635 | ||
7629 | MakeAssetRequest(transfer, taskID); | 7636 | MakeAssetRequest(transfer, taskID); |
7630 | 7637 | ||
@@ -11985,6 +11992,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11985 | { | 11992 | { |
11986 | requestID = new UUID(transferRequest.TransferInfo.Params, 80); | 11993 | requestID = new UUID(transferRequest.TransferInfo.Params, 80); |
11987 | } | 11994 | } |
11995 | else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimEstate) | ||
11996 | { | ||
11997 | requestID = taskID; | ||
11998 | } | ||
11999 | |||
11988 | 12000 | ||
11989 | // m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID); | 12001 | // m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID); |
11990 | 12002 | ||