diff options
author | Diva Canto | 2012-03-27 11:54:13 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-27 11:54:13 -0700 |
commit | de242a29caaaa77de5ea175a2abab9cdcafcd878 (patch) | |
tree | c61b78515ebd0fc95ec700e8845b56e035a10288 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-de242a29caaaa77de5ea175a2abab9cdcafcd878.zip opensim-SC_OLD-de242a29caaaa77de5ea175a2abab9cdcafcd878.tar.gz opensim-SC_OLD-de242a29caaaa77de5ea175a2abab9cdcafcd878.tar.bz2 opensim-SC_OLD-de242a29caaaa77de5ea175a2abab9cdcafcd878.tar.xz |
HG: beginning of a more restrictive inventory access procedure (optional). Experimental: we'll try switching the root folder from under the viewer.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index bef012d..2d73594 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -447,7 +447,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
447 | "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}. Returning avatar to source region.", | 447 | "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}. Returning avatar to source region.", |
448 | sp.Name, finalDestination.RegionName); | 448 | sp.Name, finalDestination.RegionName); |
449 | 449 | ||
450 | Fail(sp, finalDestination); | 450 | Fail(sp, finalDestination, logout); |
451 | return; | 451 | return; |
452 | } | 452 | } |
453 | 453 | ||
@@ -479,7 +479,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
479 | "[ENTITY TRANSFER MODULE]: Teleport of {0} to {1} failed due to no callback from destination region. Returning avatar to source region.", | 479 | "[ENTITY TRANSFER MODULE]: Teleport of {0} to {1} failed due to no callback from destination region. Returning avatar to source region.", |
480 | sp.Name, finalDestination.RegionName); | 480 | sp.Name, finalDestination.RegionName); |
481 | 481 | ||
482 | Fail(sp, finalDestination); | 482 | Fail(sp, finalDestination, logout); |
483 | return; | 483 | return; |
484 | } | 484 | } |
485 | 485 | ||
@@ -530,7 +530,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
530 | } | 530 | } |
531 | } | 531 | } |
532 | 532 | ||
533 | private void Fail(ScenePresence sp, GridRegion finalDestination) | 533 | protected virtual void Fail(ScenePresence sp, GridRegion finalDestination, bool logout) |
534 | { | 534 | { |
535 | // Client never contacted destination. Let's restore everything back | 535 | // Client never contacted destination. Let's restore everything back |
536 | sp.ControllingClient.SendTeleportFailed("Problems connecting to destination."); | 536 | sp.ControllingClient.SendTeleportFailed("Problems connecting to destination."); |