OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another attempt at mantis #3527.

0.6.5-rc1
diva 2009-04-27 17:19:29 +00:00
parent 81bc38708a
commit 4ec9979475
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -101,6 +101,15 @@ namespace OpenSim.Region.Communications.OGS1
// see IGridServices // see IGridServices
public RegionCommsListener RegisterRegion(RegionInfo regionInfo) 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_regionsOnInstance.Add(regionInfo);
m_log.InfoFormat( m_log.InfoFormat(
@ -178,7 +187,8 @@ namespace OpenSim.Region.Communications.OGS1
if ((string) GridRespData["allow_forceful_banlines"] != "TRUE") if ((string) GridRespData["allow_forceful_banlines"] != "TRUE")
{ {
//m_localBackend.SetForcefulBanlistsDisallowed(regionInfo.RegionHandle); //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");
} }
} }