aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs4
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs20
2 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 1d63d26..74a7a50 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -184,11 +184,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
184 return false; 184 return false;
185 } 185 }
186 else if ( 186 else if (
187 regions[i].RegionLocX == regions[j].RegionLocX && regions[i].RegionLocY == regions[j].RegionLocY) 187 regions[i].LegacyRegionLocX == regions[j].LegacyRegionLocX && regions[i].LegacyRegionLocY == regions[j].LegacyRegionLocY)
188 { 188 {
189 m_log.ErrorFormat( 189 m_log.ErrorFormat(
190 "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same grid location ({2}, {3})", 190 "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same grid location ({2}, {3})",
191 regions[i].RegionName, regions[j].RegionName, regions[i].RegionLocX, regions[i].RegionLocY); 191 regions[i].RegionName, regions[j].RegionName, regions[i].LegacyRegionLocX, regions[i].LegacyRegionLocY);
192 return false; 192 return false;
193 } 193 }
194 else if (regions[i].InternalEndPoint.Port == regions[j].InternalEndPoint.Port) 194 else if (regions[i].InternalEndPoint.Port == regions[j].InternalEndPoint.Port)
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 8b66ee1..d2f74de 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -542,7 +542,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
542 throw new Exception( 542 throw new Exception(
543 String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>", 543 String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>",
544 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 544 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
545 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); 545 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY));
546 } 546 }
547 else 547 else
548 { 548 {
@@ -556,8 +556,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
556 region.RegionID = regionID; 556 region.RegionID = regionID;
557 region.originRegionID = regionID; 557 region.originRegionID = regionID;
558 region.RegionName = (string) requestData["region_name"]; 558 region.RegionName = (string) requestData["region_name"];
559 region.RegionLocX = Convert.ToUInt32(requestData["region_x"]); 559 region.LegacyRegionLocX = Convert.ToUInt32(requestData["region_x"]);
560 region.RegionLocY = Convert.ToUInt32(requestData["region_y"]); 560 region.LegacyRegionLocY = Convert.ToUInt32(requestData["region_y"]);
561 561
562 // check for collisions: region name, region UUID, 562 // check for collisions: region name, region UUID,
563 // region location 563 // region location
@@ -565,14 +565,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
565 throw new Exception( 565 throw new Exception(
566 String.Format("region name already in use by region {0}, UUID {1}, <{2},{3}>", 566 String.Format("region name already in use by region {0}, UUID {1}, <{2},{3}>",
567 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 567 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
568 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); 568 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY));
569 569
570 if (m_application.SceneManager.TryGetScene(region.RegionLocX, region.RegionLocY, out scene)) 570 if (m_application.SceneManager.TryGetScene(region.LegacyRegionLocX, region.LegacyRegionLocY, out scene))
571 throw new Exception( 571 throw new Exception(
572 String.Format("region location <{0},{1}> already in use by region {2}, UUID {3}, <{4},{5}>", 572 String.Format("region location <{0},{1}> already in use by region {2}, UUID {3}, <{4},{5}>",
573 region.RegionLocX, region.RegionLocY, 573 region.LegacyRegionLocX, region.LegacyRegionLocY,
574 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 574 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
575 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); 575 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY));
576 576
577 region.InternalEndPoint = 577 region.InternalEndPoint =
578 new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0); 578 new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0);
@@ -586,7 +586,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
586 region.InternalEndPoint.Address, 586 region.InternalEndPoint.Address,
587 region.InternalEndPoint.Port, 587 region.InternalEndPoint.Port,
588 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 588 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
589 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); 589 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY));
590 590
591 region.ExternalHostName = (string) requestData["external_address"]; 591 region.ExternalHostName = (string) requestData["external_address"];
592 592
@@ -625,8 +625,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
625 String.Format( 625 String.Format(
626 m_config.GetString("region_file_template", 626 m_config.GetString("region_file_template",
627 "{0}x{1}-{2}.ini"), 627 "{0}x{1}-{2}.ini"),
628 region.RegionLocX.ToString(), 628 region.LegacyRegionLocX.ToString(),
629 region.RegionLocY.ToString(), 629 region.LegacyRegionLocY.ToString(),
630 regionID.ToString(), 630 regionID.ToString(),
631 region.InternalEndPoint.Port.ToString(), 631 region.InternalEndPoint.Port.ToString(),
632 region.RegionName.Replace(" ", "_").Replace(":", "_"). 632 region.RegionName.Replace(" ", "_").Replace(":", "_").