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

* Improve loadregions so that all region configs are checked for clashes (e.g. same uuid) rather than just one

0.6.5-rc1
Justin Clarke Casey 2009-05-14 18:24:52 +00:00
parent 303aa4b65e
commit b2433d2b99
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
public void Initialise() public void Initialise()
{ {
m_log.Info("[LOADREGIONS]: " + Name + " cannot be default-initialized!"); m_log.Error("[LOADREGIONS]: " + Name + " cannot be default-initialized!");
throw new PluginNotInitialisedException(Name); throw new PluginNotInitialisedException(Name);
} }
@ -80,17 +80,17 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
public void PostInitialise() public void PostInitialise()
{ {
m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); //m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
IRegionLoader regionLoader; IRegionLoader regionLoader;
if (m_openSim.ConfigSource.Source.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem") if (m_openSim.ConfigSource.Source.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
{ {
m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem"); m_log.Info("[LOADREGIONS]: Loading region configurations from filesystem");
regionLoader = new RegionLoaderFileSystem(); regionLoader = new RegionLoaderFileSystem();
} }
else else
{ {
m_log.Info("[LOADREGIONSPLUGIN]: Loading Region Info from web"); m_log.Info("[LOADREGIONSPLUGIN]: Loading region configurations from web");
regionLoader = new RegionLoaderWebServer(); regionLoader = new RegionLoaderWebServer();
} }
@ -142,38 +142,33 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
/// <returns>True if we're sane, false if we're insane</returns> /// <returns>True if we're sane, false if we're insane</returns>
private bool CheckRegionsForSanity(RegionInfo[] regions) private bool CheckRegionsForSanity(RegionInfo[] regions)
{ {
if (regions.Length <= 0) if (regions.Length <= 1)
return true; return true;
List<RegionInfo> checkedRegions = new List<RegionInfo>(); for (int i = 0; i < regions.Length - 1; i++)
checkedRegions.Add(regions[0]);
for (int i = 1; i < regions.Length; i++)
{ {
RegionInfo region = regions[i]; for (int j = i + 1; j < regions.Length; j++)
foreach (RegionInfo checkedRegion in checkedRegions)
{ {
if (region.RegionID == checkedRegion.RegionID) if (regions[i].RegionID == regions[j].RegionID)
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[LOADREGIONS]: Regions {0} and {1} have the same UUID {2}", "[LOADREGIONS]: Regions {0} and {1} have the same UUID {2}",
region.RegionName, checkedRegion.RegionName, region.RegionID); regions[i].RegionName, regions[j].RegionName, regions[i].RegionID);
return false; return false;
} }
else if (region.RegionLocX == checkedRegion.RegionLocX && else if (
region.RegionLocY == checkedRegion.RegionLocY) regions[i].RegionLocX == regions[j].RegionLocX && regions[i].RegionLocY == regions[j].RegionLocY)
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[LOADREGIONS]: Regions {0} and {1} have the same location {2} {3}", "[LOADREGIONS]: Regions {0} and {1} have the same grid location ({2}, {3})",
region.RegionName, checkedRegion.RegionName, region.RegionLocX, region.RegionLocY); regions[i].RegionName, regions[j].RegionName, regions[i].RegionLocX, regions[i].RegionLocY);
return false; return false;
} }
else if (region.InternalEndPoint.Port == checkedRegion.InternalEndPoint.Port) else if (regions[i].InternalEndPoint.Port == regions[j].InternalEndPoint.Port)
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[LOADREGIONS]: Regions {0} and {1} have the same internal IP port {2}", "[LOADREGIONS]: Regions {0} and {1} have the same internal IP port {2}",
region.RegionName, checkedRegion.RegionName, region.InternalEndPoint.Port); regions[i].RegionName, regions[j].RegionName, regions[i].InternalEndPoint.Port);
return false; return false;
} }
} }