aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-29 07:25:58 +0000
committerTeravus Ovares2007-11-29 07:25:58 +0000
commit4738fead21f9d02c23702613fd1e1eec1d1a75a1 (patch)
treea0f365668801cfe6ac57306a9231b9df77dec711 /OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
parentfixed duplicate login in standalone mode (mostly untested in grid mode) (diff)
downloadopensim-SC_OLD-4738fead21f9d02c23702613fd1e1eec1d1a75a1.zip
opensim-SC_OLD-4738fead21f9d02c23702613fd1e1eec1d1a75a1.tar.gz
opensim-SC_OLD-4738fead21f9d02c23702613fd1e1eec1d1a75a1.tar.bz2
opensim-SC_OLD-4738fead21f9d02c23702613fd1e1eec1d1a75a1.tar.xz
* Added a 50 second restart notify timer that gets reset when new regions come up to give servers that host a lot of sims a long time to start listening.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 905764d..0923010 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -251,7 +251,10 @@ namespace OpenSim.Region.Environment.Scenes
251 { 251 {
252 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); 252 //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
253 253
254 List<SimpleRegionInfo> neighbours = m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); 254
255 List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
256
257 neighbours = m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
255 if (neighbours != null) 258 if (neighbours != null)
256 { 259 {
257 for (int i = 0; i < neighbours.Count; i++) 260 for (int i = 0; i < neighbours.Count; i++)
@@ -264,6 +267,7 @@ namespace OpenSim.Region.Environment.Scenes
264 d); 267 d);
265 } 268 }
266 } 269 }
270
267 //bool val = m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region)); 271 //bool val = m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region));
268 } 272 }
269 273