diff options
author | diva | 2009-01-18 01:45:22 +0000 |
---|---|---|
committer | diva | 2009-01-18 01:45:22 +0000 |
commit | 1d8821ccb2783463720380d7d61adda427074dad (patch) | |
tree | c4ae64977e8a5e3ad51b23e832af2028c4f525c2 /OpenSim/Region/Environment/Scenes | |
parent | Change list type to compare length instead of references. (diff) | |
download | opensim-SC-1d8821ccb2783463720380d7d61adda427074dad.zip opensim-SC-1d8821ccb2783463720380d7d61adda427074dad.tar.gz opensim-SC-1d8821ccb2783463720380d7d61adda427074dad.tar.bz2 opensim-SC-1d8821ccb2783463720380d7d61adda427074dad.tar.xz |
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')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 13 |
2 files changed, 2 insertions, 24 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. |
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. |