diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
| commit | 94cb4b486a7c72841ccbcec403fc7b8c95c1249a (patch) | |
| tree | 176ada6e4259c076ab6942b4c96538d868880281 /OpenSim/Region/RegionCombinerModule | |
| parent | * Adds a test for if the collision is at the bottom of the capsule on avatar.... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.zip opensim-SC-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.gz opensim-SC-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.bz2 opensim-SC-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 7ec1d4b..92f060b 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
| @@ -325,7 +325,7 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 325 | >= (regionConnections.Y * (int)Constants.RegionSize))) | 325 | >= (regionConnections.Y * (int)Constants.RegionSize))) |
| 326 | { | 326 | { |
| 327 | connectedYN = DoWorkForOneRegionOverXPlusY(conn, regionConnections, scene); | 327 | connectedYN = DoWorkForOneRegionOverXPlusY(conn, regionConnections, scene); |
| 328 | break; | 328 | break; |
| 329 | } | 329 | } |
| 330 | 330 | ||
| 331 | // If we're one region over +x +y | 331 | // If we're one region over +x +y |
| @@ -338,7 +338,7 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 338 | >= (regionConnections.Y * (int)Constants.RegionSize))) | 338 | >= (regionConnections.Y * (int)Constants.RegionSize))) |
| 339 | { | 339 | { |
| 340 | connectedYN = DoWorkForOneRegionOverPlusXPlusY(conn, regionConnections, scene); | 340 | connectedYN = DoWorkForOneRegionOverPlusXPlusY(conn, regionConnections, scene); |
| 341 | break; | 341 | break; |
| 342 | 342 | ||
| 343 | } | 343 | } |
| 344 | } | 344 | } |