diff options
Getting rid of the CheckRegion call during TPs. This seems to be not just useless, but sometimes problematic (mantis #2999). Initial tests indicate that this call is not necessary. Let's see if this stands in the wild.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index a46fa0b..4f3863c 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -685,7 +685,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
685 | if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) | 685 | if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) |
686 | return; | 686 | return; |
687 | 687 | ||
688 | bool destRegionUp = false; | 688 | bool destRegionUp = true; |
689 | 689 | ||
690 | IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); | 690 | IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); |
691 | 691 | ||
@@ -726,17 +726,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
726 | if (eq == null) | 726 | if (eq == null) |
727 | avatar.ControllingClient.SendTeleportLocationStart(); | 727 | avatar.ControllingClient.SendTeleportLocationStart(); |
728 | 728 | ||
729 | if (reg.RemotingAddress != "" && reg.RemotingPort != 0) | ||
730 | { | ||
731 | // region is remote. see if it is up | ||
732 | destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort); | ||
733 | } | ||
734 | else | ||
735 | { | ||
736 | // assume local regions are always up | ||
737 | destRegionUp = true; | ||
738 | } | ||
739 | |||
740 | // Let's do DNS resolution only once in this process, please! | 729 | // Let's do DNS resolution only once in this process, please! |
741 | // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field, | 730 | // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field, |
742 | // it's actually doing a lot of work. | 731 | // it's actually doing a lot of work. |