From 4ec9979475bc822960d2b99acc2deba3a3ea222c Mon Sep 17 00:00:00 2001 From: diva Date: Mon, 27 Apr 2009 17:19:29 +0000 Subject: [PATCH] Another attempt at mantis #3527. --- .../Region/Communications/OGS1/OGS1GridServices.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 27b20ef5a3..cf99907993 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -101,6 +101,15 @@ namespace OpenSim.Region.Communications.OGS1 // see IGridServices public RegionCommsListener RegisterRegion(RegionInfo regionInfo) { + if (m_regionsOnInstance.Contains(regionInfo)) + { + m_log.Debug("[OGS1 GRID SERVICES] Foobar! Client is confused, region already registered " + regionInfo.RegionName); + Exception e = new Exception(String.Format("Unable to register region")); + + throw e; + + } + m_regionsOnInstance.Add(regionInfo); m_log.InfoFormat( @@ -178,7 +187,8 @@ namespace OpenSim.Region.Communications.OGS1 if ((string) GridRespData["allow_forceful_banlines"] != "TRUE") { //m_localBackend.SetForcefulBanlistsDisallowed(regionInfo.RegionHandle); - m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE"); + if (!m_queuedGridSettings.ContainsKey("allow_forceful_banlines")) + m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE"); } }