aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 27b20ef..cf99907 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -101,6 +101,15 @@ namespace OpenSim.Region.Communications.OGS1
101 // see IGridServices 101 // see IGridServices
102 public RegionCommsListener RegisterRegion(RegionInfo regionInfo) 102 public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
103 { 103 {
104 if (m_regionsOnInstance.Contains(regionInfo))
105 {
106 m_log.Debug("[OGS1 GRID SERVICES] Foobar! Client is confused, region already registered " + regionInfo.RegionName);
107 Exception e = new Exception(String.Format("Unable to register region"));
108
109 throw e;
110
111 }
112
104 m_regionsOnInstance.Add(regionInfo); 113 m_regionsOnInstance.Add(regionInfo);
105 114
106 m_log.InfoFormat( 115 m_log.InfoFormat(
@@ -178,7 +187,8 @@ namespace OpenSim.Region.Communications.OGS1
178 if ((string) GridRespData["allow_forceful_banlines"] != "TRUE") 187 if ((string) GridRespData["allow_forceful_banlines"] != "TRUE")
179 { 188 {
180 //m_localBackend.SetForcefulBanlistsDisallowed(regionInfo.RegionHandle); 189 //m_localBackend.SetForcefulBanlistsDisallowed(regionInfo.RegionHandle);
181 m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE"); 190 if (!m_queuedGridSettings.ContainsKey("allow_forceful_banlines"))
191 m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE");
182 } 192 }
183 } 193 }
184 194