diff options
| author | UbitUmarov | 2018-05-04 23:01:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2018-05-04 23:01:53 +0100 |
| commit | 09ae675d28d2ea921bdf9415bfa9c0dfad17f963 (patch) | |
| tree | 2ae5b2ec99274d20baed9b1014004258056bf214 /OpenSim/Region | |
| parent | mantis 8084: add the missing PRIM_ALPHA_MODE constants (diff) | |
| parent | fix ubOde terrain copy at north and east borders (diff) | |
| download | opensim-SC-09ae675d28d2ea921bdf9415bfa9c0dfad17f963.zip opensim-SC-09ae675d28d2ea921bdf9415bfa9c0dfad17f963.tar.gz opensim-SC-09ae675d28d2ea921bdf9415bfa9c0dfad17f963.tar.bz2 opensim-SC-09ae675d28d2ea921bdf9415bfa9c0dfad17f963.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index 0003085..e4397e3 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | |||
| @@ -2260,8 +2260,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
| 2260 | float val; | 2260 | float val; |
| 2261 | 2261 | ||
| 2262 | 2262 | ||
| 2263 | uint maxXX = regionsizeX - 1; | 2263 | uint maxXX = regionsizeX + 1; |
| 2264 | uint maxYY = regionsizeY - 1; | 2264 | uint maxYY = regionsizeY + 1; |
| 2265 | // adding one margin all around so things don't fall in edges | 2265 | // adding one margin all around so things don't fall in edges |
| 2266 | 2266 | ||
| 2267 | uint xx; | 2267 | uint xx; |