diff options
| author | Melanie | 2009-09-01 01:56:59 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-01 01:56:59 +0100 |
| commit | 22457c984395c5d6f957d75c9c7f66cbb095ac29 (patch) | |
| tree | e467ef4a97f8c175fbaf737c0d1d2a565a48dc16 /OpenSim/Region/Framework | |
| parent | Experimental. Set attachment flag early on rezzing from inventory. (diff) | |
| parent | * -2 on the south and west side, -1 on the north and east side. Fuzzy borde... (diff) | |
| download | opensim-SC-22457c984395c5d6f957d75c9c7f66cbb095ac29.zip opensim-SC-22457c984395c5d6f957d75c9c7f66cbb095ac29.tar.gz opensim-SC-22457c984395c5d6f957d75c9c7f66cbb095ac29.tar.bz2 opensim-SC-22457c984395c5d6f957d75c9c7f66cbb095ac29.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f4a0d2e..7527d8c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -337,22 +337,22 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 337 | BordersLocked = true; | 337 | BordersLocked = true; |
| 338 | 338 | ||
| 339 | Border northBorder = new Border(); | 339 | Border northBorder = new Border(); |
| 340 | northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- | 340 | northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1); //<--- |
| 341 | northBorder.CrossDirection = Cardinals.N; | 341 | northBorder.CrossDirection = Cardinals.N; |
| 342 | NorthBorders.Add(northBorder); | 342 | NorthBorders.Add(northBorder); |
| 343 | 343 | ||
| 344 | Border southBorder = new Border(); | 344 | Border southBorder = new Border(); |
| 345 | southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //---> | 345 | southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2); //---> |
| 346 | southBorder.CrossDirection = Cardinals.S; | 346 | southBorder.CrossDirection = Cardinals.S; |
| 347 | SouthBorders.Add(southBorder); | 347 | SouthBorders.Add(southBorder); |
| 348 | 348 | ||
| 349 | Border eastBorder = new Border(); | 349 | Border eastBorder = new Border(); |
| 350 | eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- | 350 | eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1); //<--- |
| 351 | eastBorder.CrossDirection = Cardinals.E; | 351 | eastBorder.CrossDirection = Cardinals.E; |
| 352 | EastBorders.Add(eastBorder); | 352 | EastBorders.Add(eastBorder); |
| 353 | 353 | ||
| 354 | Border westBorder = new Border(); | 354 | Border westBorder = new Border(); |
| 355 | westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, 0); //---> | 355 | westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2); //---> |
| 356 | westBorder.CrossDirection = Cardinals.W; | 356 | westBorder.CrossDirection = Cardinals.W; |
| 357 | WestBorders.Add(westBorder); | 357 | WestBorders.Add(westBorder); |
| 358 | 358 | ||
| @@ -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(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- | 492 | northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1); //<--- |
| 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(float.MinValue, float.MaxValue, 0); //---> | 497 | southBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2); //---> |
| 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(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- | 502 | eastBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize + 1); //<--- |
| 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(float.MinValue, float.MaxValue, 0); //---> | 507 | westBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, -2); //---> |
| 508 | westBorder.CrossDirection = Cardinals.W; | 508 | westBorder.CrossDirection = Cardinals.W; |
| 509 | WestBorders.Add(westBorder); | 509 | WestBorders.Add(westBorder); |
| 510 | BordersLocked = false; | 510 | BordersLocked = false; |