aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-30 00:22:38 -0400
committerTeravus Ovares (Dan Olivares)2009-08-30 00:22:38 -0400
commit59c8a02a24fb04313ede77ba926da29ed43ec6cd (patch)
tree5c9323176ea50518fe309bd1caf8c58bc4dcc5b7 /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-59c8a02a24fb04313ede77ba926da29ed43ec6cd.zip
opensim-SC_OLD-59c8a02a24fb04313ede77ba926da29ed43ec6cd.tar.gz
opensim-SC_OLD-59c8a02a24fb04313ede77ba926da29ed43ec6cd.tar.bz2
opensim-SC_OLD-59c8a02a24fb04313ede77ba926da29ed43ec6cd.tar.xz
* When the RegionCombinerModule is off, make borders have an infinite aabb perpendicular to the cardinal
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
1 files changed, 5 insertions, 5 deletions
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;