aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-08-07 15:21:50 +0000
committerCharles Krinke2008-08-07 15:21:50 +0000
commit6b7fb1712ce29301b8132c9d1f48ce14090a4727 (patch)
tree5376fd4ec6d315696236b249b70776a95c6d5891
parentMantis#1901. Thank you kindly, Nlin for a patch that: (diff)
downloadopensim-SC-6b7fb1712ce29301b8132c9d1f48ce14090a4727.zip
opensim-SC-6b7fb1712ce29301b8132c9d1f48ce14090a4727.tar.gz
opensim-SC-6b7fb1712ce29301b8132c9d1f48ce14090a4727.tar.bz2
opensim-SC-6b7fb1712ce29301b8132c9d1f48ce14090a4727.tar.xz
Mantis#1894. Thank you kindly, HomerHorwitz for a patch that:
When a region is re-registered (e.g. because of region restart), it is removed from m_regions. If I understood that correctly, the old entry should be replaced, instead.
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index fa7a2de..f967cf7 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -109,7 +109,8 @@ namespace OpenSim.Region.Communications.Local
109 else 109 else
110 { 110 {
111 // Already in our list, so the region went dead and restarted. 111 // Already in our list, so the region went dead and restarted.
112 m_regions.Remove(regionInfo.RegionHandle); 112 // replace the old regioninfo
113 m_regions[regionInfo.RegionHandle] = regionInfo;
113 m_log.Warn("[INTERREGION STANDALONE]: Region registered twice. Region went down and came back up."); 114 m_log.Warn("[INTERREGION STANDALONE]: Region registered twice. Region went down and came back up.");
114 115
115 RegionCommsListener regionHost = new RegionCommsListener(); 116 RegionCommsListener regionHost = new RegionCommsListener();