aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-19 03:56:25 +0100
committerJustin Clark-Casey (justincc)2012-05-19 03:56:25 +0100
commitd7f90dee1ce0bd84200f327ce3f62697c876ef5b (patch)
treefd963425e7a34fa4c1ba26b5d0622f25821d7993 /OpenSim/Region/RegionCombinerModule
parentMake the megaregion total area given to the physics module accurate instead o... (diff)
downloadopensim-SC_OLD-d7f90dee1ce0bd84200f327ce3f62697c876ef5b.zip
opensim-SC_OLD-d7f90dee1ce0bd84200f327ce3f62697c876ef5b.tar.gz
opensim-SC_OLD-d7f90dee1ce0bd84200f327ce3f62697c876ef5b.tar.bz2
opensim-SC_OLD-d7f90dee1ce0bd84200f327ce3f62697c876ef5b.tar.xz
Correct some log messages in RegionCombinerModule about the position of the root region of a megaregion relative to an added region
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index a2050b2..95db22b 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -229,8 +229,6 @@ namespace OpenSim.Region.RegionCombinerModule
229 westBorder.CrossDirection = Cardinals.W; 229 westBorder.CrossDirection = Cardinals.W;
230 scene.WestBorders[0] = westBorder; 230 scene.WestBorders[0] = westBorder;
231 231
232
233
234 RegionConnections regionConnections = new RegionConnections(); 232 RegionConnections regionConnections = new RegionConnections();
235 regionConnections.ConnectedRegions = new List<RegionData>(); 233 regionConnections.ConnectedRegions = new List<RegionData>();
236 regionConnections.RegionScene = scene; 234 regionConnections.RegionScene = scene;
@@ -475,7 +473,7 @@ namespace OpenSim.Region.RegionCombinerModule
475 conn.UpdateExtents(extents); 473 conn.UpdateExtents(extents);
476 474
477 m_log.DebugFormat( 475 m_log.DebugFormat(
478 "[REGION COMBINER MODULE]: Scene {0} to the west of Scene {1}, Offset: {2}, Extents: {3}", 476 "[REGION COMBINER MODULE]: Root region {0} is to the west of region {1}, Offset: {2}, Extents: {3}",
479 conn.RegionScene.RegionInfo.RegionName, 477 conn.RegionScene.RegionInfo.RegionName,
480 regionConnections.RegionScene.RegionInfo.RegionName, offset, extents); 478 regionConnections.RegionScene.RegionInfo.RegionName, offset, extents);
481 479
@@ -554,7 +552,7 @@ namespace OpenSim.Region.RegionCombinerModule
554 conn.ConnectedRegions.Add(ConnectedRegion); 552 conn.ConnectedRegions.Add(ConnectedRegion);
555 553
556 m_log.DebugFormat( 554 m_log.DebugFormat(
557 "[REGION COMBINER MODULE]: Scene: {0} to the northeast of Scene {1}, Offset: {2}, Extents: {3}", 555 "[REGION COMBINER MODULE]: Root region {0} is to the south of region {1}, Offset: {2}, Extents: {3}",
558 conn.RegionScene.RegionInfo.RegionName, 556 conn.RegionScene.RegionInfo.RegionName,
559 regionConnections.RegionScene.RegionInfo.RegionName, offset, extents); 557 regionConnections.RegionScene.RegionInfo.RegionName, offset, extents);
560 558
@@ -616,7 +614,7 @@ namespace OpenSim.Region.RegionCombinerModule
616 conn.ConnectedRegions.Add(ConnectedRegion); 614 conn.ConnectedRegions.Add(ConnectedRegion);
617 615
618 m_log.DebugFormat( 616 m_log.DebugFormat(
619 "[REGION COMBINER MODULE]: Scene: {0} to the NorthEast of Scene {1}, Offset: {2}, Extents: {3}", 617 "[REGION COMBINER MODULE]: Region {0} is to the southwest of Scene {1}, Offset: {2}, Extents: {3}",
620 conn.RegionScene.RegionInfo.RegionName, 618 conn.RegionScene.RegionInfo.RegionName,
621 regionConnections.RegionScene.RegionInfo.RegionName, offset, extents); 619 regionConnections.RegionScene.RegionInfo.RegionName, offset, extents);
622 620