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/Hypergrid/HGSceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | 13 |
1 files changed, 1 insertions, 12 deletions
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 | |||
70 | if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) | 70 | if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) |
71 | return; | 71 | return; |
72 | 72 | ||
73 | bool destRegionUp = false; | 73 | bool destRegionUp = true; |
74 | 74 | ||
75 | IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); | 75 | IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); |
76 | 76 | ||
@@ -137,17 +137,6 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid | |||
137 | avatar.ControllingClient.SendTeleportLocationStart(); | 137 | avatar.ControllingClient.SendTeleportLocationStart(); |
138 | 138 | ||
139 | 139 | ||
140 | if (reg.RemotingAddress != "" && reg.RemotingPort != 0) | ||
141 | { | ||
142 | // region is remote. see if it is up | ||
143 | destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort); | ||
144 | } | ||
145 | else | ||
146 | { | ||
147 | // assume local regions are always up | ||
148 | destRegionUp = true; | ||
149 | } | ||
150 | |||
151 | // Let's do DNS resolution only once in this process, please! | 140 | // Let's do DNS resolution only once in this process, please! |
152 | // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field, | 141 | // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field, |
153 | // it's actually doing a lot of work. | 142 | // it's actually doing a lot of work. |