aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorlbsa712008-08-08 10:59:32 +0000
committerlbsa712008-08-08 10:59:32 +0000
commit22f09fbd213ffd414514756b4a7ee0e86325d733 (patch)
tree812fd206280d2f527063a902e0a041612338947f /OpenSim/Region/Environment/Scenes
parentDe-coupling the IClientAPI interface and ClientManager class from the (diff)
downloadopensim-SC_OLD-22f09fbd213ffd414514756b4a7ee0e86325d733.zip
opensim-SC_OLD-22f09fbd213ffd414514756b4a7ee0e86325d733.tar.gz
opensim-SC_OLD-22f09fbd213ffd414514756b4a7ee0e86325d733.tar.bz2
opensim-SC_OLD-22f09fbd213ffd414514756b4a7ee0e86325d733.tar.xz
* All CheckRegion within an instance would use the same, global, bool for 'Available', which would lead to intermittent failures on parallell teleport requests.
* Solidified CheckRegion somewhat, adding a second try if the first failed.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index b35e60f..cb37faf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -580,8 +580,7 @@ namespace OpenSim.Region.Environment.Scenes
580 if (reg.RemotingAddress != "" && reg.RemotingPort != 0) 580 if (reg.RemotingAddress != "" && reg.RemotingPort != 0)
581 { 581 {
582 // region is remote. see if it is up 582 // region is remote. see if it is up
583 m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort); 583 destRegionUp = m_commsProvider.InterRegion.CheckRegion(reg.RemotingAddress, reg.RemotingPort);
584 destRegionUp = m_commsProvider.InterRegion.Available;
585 } 584 }
586 else 585 else
587 { 586 {