diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-30 00:22:38 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-30 00:22:38 -0400 |
commit | 59c8a02a24fb04313ede77ba926da29ed43ec6cd (patch) | |
tree | 5c9323176ea50518fe309bd1caf8c58bc4dcc5b7 /OpenSim/Region/CoreModules | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC-59c8a02a24fb04313ede77ba926da29ed43ec6cd.zip opensim-SC-59c8a02a24fb04313ede77ba926da29ed43ec6cd.tar.gz opensim-SC-59c8a02a24fb04313ede77ba926da29ed43ec6cd.tar.bz2 opensim-SC-59c8a02a24fb04313ede77ba926da29ed43ec6cd.tar.xz |
* When the RegionCombinerModule is off, make borders have an infinite aabb perpendicular to the cardinal
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 22 |
1 files changed, 21 insertions, 1 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; |