diff options
author | Robert Adams | 2013-12-14 07:53:01 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-14 07:53:01 -0800 |
commit | 13a9a4b653c5470e6a450bfd9b2049273a4ef7b2 (patch) | |
tree | 1168d93ebfff04893ec05a32c6bad456e1d00d32 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.zip opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.gz opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.bz2 opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.xz |
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
-rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 3f835a4..7127c73 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
@@ -246,8 +246,8 @@ namespace OpenSim.Region.RegionCombinerModule | |||
246 | newConn.RegionScene = scene; | 246 | newConn.RegionScene = scene; |
247 | newConn.RegionLandChannel = scene.LandChannel; | 247 | newConn.RegionLandChannel = scene.LandChannel; |
248 | newConn.RegionId = scene.RegionInfo.originRegionID; | 248 | newConn.RegionId = scene.RegionInfo.originRegionID; |
249 | newConn.X = scene.RegionInfo.LegacyRegionLocX; | 249 | newConn.X = scene.RegionInfo.RegionLocX; |
250 | newConn.Y = scene.RegionInfo.LegacyRegionLocY; | 250 | newConn.Y = scene.RegionInfo.RegionLocY; |
251 | newConn.XEnd = (int)Constants.RegionSize; | 251 | newConn.XEnd = (int)Constants.RegionSize; |
252 | newConn.YEnd = (int)Constants.RegionSize; | 252 | newConn.YEnd = (int)Constants.RegionSize; |
253 | 253 | ||
@@ -502,11 +502,11 @@ namespace OpenSim.Region.RegionCombinerModule | |||
502 | 502 | ||
503 | lock (scene.WestBorders) | 503 | lock (scene.WestBorders) |
504 | { | 504 | { |
505 | scene.WestBorders[0].BorderLine.Z = (int)((scene.RegionInfo.LegacyRegionLocX - rootConn.RegionScene.RegionInfo.LegacyRegionLocX) * (int)Constants.RegionSize); //auto teleport West | 505 | scene.WestBorders[0].BorderLine.Z = (int)((scene.RegionInfo.RegionLocX - rootConn.RegionScene.RegionInfo.RegionLocX) * (int)Constants.RegionSize); //auto teleport West |
506 | 506 | ||
507 | // Trigger auto teleport to root region | 507 | // Trigger auto teleport to root region |
508 | scene.WestBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.LegacyRegionLocX; | 508 | scene.WestBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.RegionLocX; |
509 | scene.WestBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.LegacyRegionLocY; | 509 | scene.WestBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.RegionLocY; |
510 | } | 510 | } |
511 | 511 | ||
512 | // Reset Terrain.. since terrain loads before we get here, we need to load | 512 | // Reset Terrain.. since terrain loads before we get here, we need to load |
@@ -564,9 +564,9 @@ namespace OpenSim.Region.RegionCombinerModule | |||
564 | 564 | ||
565 | lock (scene.SouthBorders) | 565 | lock (scene.SouthBorders) |
566 | { | 566 | { |
567 | scene.SouthBorders[0].BorderLine.Z = (int)((scene.RegionInfo.LegacyRegionLocY - rootConn.RegionScene.RegionInfo.LegacyRegionLocY) * (int)Constants.RegionSize); //auto teleport south | 567 | scene.SouthBorders[0].BorderLine.Z = (int)((scene.RegionInfo.RegionLocY - rootConn.RegionScene.RegionInfo.RegionLocY) * (int)Constants.RegionSize); //auto teleport south |
568 | scene.SouthBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.LegacyRegionLocX; | 568 | scene.SouthBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.RegionLocX; |
569 | scene.SouthBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.LegacyRegionLocY; | 569 | scene.SouthBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.RegionLocY; |
570 | } | 570 | } |
571 | 571 | ||
572 | // Reset Terrain.. since terrain normally loads first. | 572 | // Reset Terrain.. since terrain normally loads first. |
@@ -636,9 +636,9 @@ namespace OpenSim.Region.RegionCombinerModule | |||
636 | 636 | ||
637 | lock (scene.SouthBorders) | 637 | lock (scene.SouthBorders) |
638 | { | 638 | { |
639 | scene.SouthBorders[0].BorderLine.Z = (int)((scene.RegionInfo.LegacyRegionLocY - rootConn.RegionScene.RegionInfo.LegacyRegionLocY) * (int)Constants.RegionSize); //auto teleport south | 639 | scene.SouthBorders[0].BorderLine.Z = (int)((scene.RegionInfo.RegionLocY - rootConn.RegionScene.RegionInfo.RegionLocY) * (int)Constants.RegionSize); //auto teleport south |
640 | scene.SouthBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.LegacyRegionLocX; | 640 | scene.SouthBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.RegionLocX; |
641 | scene.SouthBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.LegacyRegionLocY; | 641 | scene.SouthBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.RegionLocY; |
642 | } | 642 | } |
643 | 643 | ||
644 | lock (rootConn.RegionScene.EastBorders) | 644 | lock (rootConn.RegionScene.EastBorders) |
@@ -657,9 +657,9 @@ namespace OpenSim.Region.RegionCombinerModule | |||
657 | 657 | ||
658 | lock (scene.WestBorders) | 658 | lock (scene.WestBorders) |
659 | { | 659 | { |
660 | scene.WestBorders[0].BorderLine.Z = (int)((scene.RegionInfo.LegacyRegionLocX - rootConn.RegionScene.RegionInfo.LegacyRegionLocX) * (int)Constants.RegionSize); //auto teleport West | 660 | scene.WestBorders[0].BorderLine.Z = (int)((scene.RegionInfo.RegionLocX - rootConn.RegionScene.RegionInfo.RegionLocX) * (int)Constants.RegionSize); //auto teleport West |
661 | scene.WestBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.LegacyRegionLocX; | 661 | scene.WestBorders[0].TriggerRegionX = rootConn.RegionScene.RegionInfo.RegionLocX; |
662 | scene.WestBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.LegacyRegionLocY; | 662 | scene.WestBorders[0].TriggerRegionY = rootConn.RegionScene.RegionInfo.RegionLocY; |
663 | } | 663 | } |
664 | 664 | ||
665 | /* | 665 | /* |