aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs22
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
2 files changed, 26 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
index 381d5ec..79c9839 100644
--- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs
@@ -28,7 +28,7 @@ namespace OpenSim.Region.CoreModules.World.Land
28 { 28 {
29 IConfig myConfig = source.Configs["Startup"]; 29 IConfig myConfig = source.Configs["Startup"];
30 enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false); 30 enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false);
31 31 //enabledYN = true;
32 } 32 }
33 33
34 public void Close() 34 public void Close()
@@ -41,6 +41,26 @@ namespace OpenSim.Region.CoreModules.World.Land
41 if (!enabledYN) 41 if (!enabledYN)
42 return; 42 return;
43 43
44 Border northBorder = new Border();
45 northBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, (int)Constants.RegionSize); //<---
46 northBorder.CrossDirection = Cardinals.N;
47 scene.NorthBorders[0] = northBorder;
48
49 Border southBorder = new Border();
50 southBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, 0); //--->
51 southBorder.CrossDirection = Cardinals.S;
52 scene.SouthBorders[0] = southBorder;
53
54 Border eastBorder = new Border();
55 eastBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, (int)Constants.RegionSize); //<---
56 eastBorder.CrossDirection = Cardinals.E;
57 scene.EastBorders[0] = eastBorder;
58
59 Border westBorder = new Border();
60 westBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, 0); //--->
61 westBorder.CrossDirection = Cardinals.W;
62 scene.WestBorders[0] = westBorder;
63
44 RegionConnections regionConnections = new RegionConnections(); 64 RegionConnections regionConnections = new RegionConnections();
45 regionConnections.ConnectedRegions = new List<RegionData>(); 65 regionConnections.ConnectedRegions = new List<RegionData>();
46 regionConnections.RegionScene = scene; 66 regionConnections.RegionScene = scene;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3e573cf..e66f1e6 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -489,22 +489,22 @@ namespace OpenSim.Region.Framework.Scenes
489 { 489 {
490 BordersLocked = true; 490 BordersLocked = true;
491 Border northBorder = new Border(); 491 Border northBorder = new Border();
492 northBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, (int)Constants.RegionSize); //<--- 492 northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<---
493 northBorder.CrossDirection = Cardinals.N; 493 northBorder.CrossDirection = Cardinals.N;
494 NorthBorders.Add(northBorder); 494 NorthBorders.Add(northBorder);
495 495
496 Border southBorder = new Border(); 496 Border southBorder = new Border();
497 southBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, 0); //---> 497 southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //--->
498 southBorder.CrossDirection = Cardinals.S; 498 southBorder.CrossDirection = Cardinals.S;
499 SouthBorders.Add(southBorder); 499 SouthBorders.Add(southBorder);
500 500
501 Border eastBorder = new Border(); 501 Border eastBorder = new Border();
502 eastBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, (int)Constants.RegionSize); //<--- 502 eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<---
503 eastBorder.CrossDirection = Cardinals.E; 503 eastBorder.CrossDirection = Cardinals.E;
504 EastBorders.Add(eastBorder); 504 EastBorders.Add(eastBorder);
505 505
506 Border westBorder = new Border(); 506 Border westBorder = new Border();
507 westBorder.BorderLine = new Vector3(0, (int)Constants.RegionSize, 0); //---> 507 westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //--->
508 westBorder.CrossDirection = Cardinals.W; 508 westBorder.CrossDirection = Cardinals.W;
509 WestBorders.Add(westBorder); 509 WestBorders.Add(westBorder);
510 BordersLocked = false; 510 BordersLocked = false;
@@ -3354,7 +3354,7 @@ namespace OpenSim.Region.Framework.Scenes
3354 Utils.LongToUInts(regionHandle, out regionX, out regionY); 3354 Utils.LongToUInts(regionHandle, out regionX, out regionY);
3355 3355
3356 int shiftx = (int) regionX - (int) m_regInfo.RegionLocX * (int)Constants.RegionSize; 3356 int shiftx = (int) regionX - (int) m_regInfo.RegionLocX * (int)Constants.RegionSize;
3357 int shifty = (int)regionY - (int)m_regInfo.RegionLocY * (int)Constants.RegionSize; 3357 int shifty = (int) regionY - (int) m_regInfo.RegionLocY * (int)Constants.RegionSize;
3358 3358
3359 position.X += shiftx; 3359 position.X += shiftx;
3360 position.Y += shifty; 3360 position.Y += shifty;