aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 354f587..febe1d7 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -545,7 +545,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
545 throw new Exception( 545 throw new Exception(
546 String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>", 546 String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>",
547 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 547 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
548 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); 548 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY));
549 } 549 }
550 else 550 else
551 { 551 {
@@ -559,8 +559,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
559 region.RegionID = regionID; 559 region.RegionID = regionID;
560 region.originRegionID = regionID; 560 region.originRegionID = regionID;
561 region.RegionName = (string) requestData["region_name"]; 561 region.RegionName = (string) requestData["region_name"];
562 region.RegionLocX = Convert.ToUInt32(requestData["region_x"]); 562 region.LegacyRegionLocX = Convert.ToUInt32(requestData["region_x"]);
563 region.RegionLocY = Convert.ToUInt32(requestData["region_y"]); 563 region.LegacyRegionLocY = Convert.ToUInt32(requestData["region_y"]);
564 564
565 // check for collisions: region name, region UUID, 565 // check for collisions: region name, region UUID,
566 // region location 566 // region location
@@ -568,14 +568,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
568 throw new Exception( 568 throw new Exception(
569 String.Format("region name already in use by region {0}, UUID {1}, <{2},{3}>", 569 String.Format("region name already in use by region {0}, UUID {1}, <{2},{3}>",
570 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 570 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
571 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); 571 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY));
572 572
573 if (m_application.SceneManager.TryGetScene(region.RegionLocX, region.RegionLocY, out scene)) 573 if (m_application.SceneManager.TryGetScene(region.LegacyRegionLocX, region.LegacyRegionLocY, out scene))
574 throw new Exception( 574 throw new Exception(
575 String.Format("region location <{0},{1}> already in use by region {2}, UUID {3}, <{4},{5}>", 575 String.Format("region location <{0},{1}> already in use by region {2}, UUID {3}, <{4},{5}>",
576 region.RegionLocX, region.RegionLocY, 576 region.LegacyRegionLocX, region.LegacyRegionLocY,
577 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 577 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
578 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); 578 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY));
579 579
580 region.InternalEndPoint = 580 region.InternalEndPoint =
581 new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0); 581 new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0);
@@ -589,7 +589,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
589 region.InternalEndPoint.Address, 589 region.InternalEndPoint.Address,
590 region.InternalEndPoint.Port, 590 region.InternalEndPoint.Port,
591 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, 591 scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
592 scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); 592 scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY));
593 593
594 region.ExternalHostName = (string) requestData["external_address"]; 594 region.ExternalHostName = (string) requestData["external_address"];
595 595
@@ -628,8 +628,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
628 String.Format( 628 String.Format(
629 m_config.GetString("region_file_template", 629 m_config.GetString("region_file_template",
630 "{0}x{1}-{2}.ini"), 630 "{0}x{1}-{2}.ini"),
631 region.RegionLocX.ToString(), 631 region.LegacyRegionLocX.ToString(),
632 region.RegionLocY.ToString(), 632 region.LegacyRegionLocY.ToString(),
633 regionID.ToString(), 633 regionID.ToString(),
634 region.InternalEndPoint.Port.ToString(), 634 region.InternalEndPoint.Port.ToString(),
635 region.RegionName.Replace(" ", "_").Replace(":", "_"). 635 region.RegionName.Replace(" ", "_").Replace(":", "_").