From 1d8821ccb2783463720380d7d61adda427074dad Mon Sep 17 00:00:00 2001 From: diva Date: Sun, 18 Jan 2009 01:45:22 +0000 Subject: 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. --- .../Scenes/Hypergrid/HGSceneCommunicationService.cs | 13 +------------ .../Region/Environment/Scenes/SceneCommunicationService.cs | 13 +------------ 2 files changed, 2 insertions(+), 24 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs index 6bcc77e..a652609 100644 --- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs @@ -70,7 +70,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) return; - bool destRegionUp = false; + bool destRegionUp = true; IEventQueue eq = avatar.Scene.RequestModuleInterface(); @@ -137,17 +137,6 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid avatar.ControllingClient.SendTeleportLocationStart(); - if (reg.RemotingAddress != "" && reg.RemotingPort != 0) - { - // region is remote. see if it is up - destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort); - } - else - { - // assume local regions are always up - destRegionUp = true; - } - // Let's do DNS resolution only once in this process, please! // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field, // it's actually doing a lot of work. 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 if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) return; - bool destRegionUp = false; + bool destRegionUp = true; IEventQueue eq = avatar.Scene.RequestModuleInterface(); @@ -726,17 +726,6 @@ namespace OpenSim.Region.Environment.Scenes if (eq == null) avatar.ControllingClient.SendTeleportLocationStart(); - if (reg.RemotingAddress != "" && reg.RemotingPort != 0) - { - // region is remote. see if it is up - destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort); - } - else - { - // assume local regions are always up - destRegionUp = true; - } - // Let's do DNS resolution only once in this process, please! // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field, // it's actually doing a lot of work. -- cgit v1.1