OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

0.6.3-post-fixes
diva 2009-01-18 01:45:22 +00:00
parent 96d6c6b1f3
commit 1d8821ccb2
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
View File

@ -70,7 +70,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID))
return; return;
bool destRegionUp = false; bool destRegionUp = true;
IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
@ -137,17 +137,6 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
avatar.ControllingClient.SendTeleportLocationStart(); 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! // 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, // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field,
// it's actually doing a lot of work. // it's actually doing a lot of work.

13
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -685,7 +685,7 @@ namespace OpenSim.Region.Environment.Scenes
if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID)) if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID))
return; return;
bool destRegionUp = false; bool destRegionUp = true;
IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
@ -726,17 +726,6 @@ namespace OpenSim.Region.Environment.Scenes
if (eq == null) if (eq == null)
avatar.ControllingClient.SendTeleportLocationStart(); 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! // 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, // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field,
// it's actually doing a lot of work. // it's actually doing a lot of work.