diff options
| author | Diva Canto | 2011-12-20 09:43:39 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-12-20 09:43:39 -0800 |
| commit | 25cbba9bca9388b414b3d4fe1e6d09a9fd5f7667 (patch) | |
| tree | 318832f03f69fc810cf07b5593c072fed5fd496a /OpenSim | |
| parent | Changed the async approach on close child agents. This may improve crossings ... (diff) | |
| download | opensim-SC_OLD-25cbba9bca9388b414b3d4fe1e6d09a9fd5f7667.zip opensim-SC_OLD-25cbba9bca9388b414b3d4fe1e6d09a9fd5f7667.tar.gz opensim-SC_OLD-25cbba9bca9388b414b3d4fe1e6d09a9fd5f7667.tar.bz2 opensim-SC_OLD-25cbba9bca9388b414b3d4fe1e6d09a9fd5f7667.tar.xz | |
Fixed bug of avie going under the terrain when crossing regions in certain directions. This was a 1-off bug: the terrain was being placed in 127, 127 resulting in a bounding box if -2, 256. I placed it in 128, 128 resulting in a bounding box of -1, 257.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index afe646c..d8aad7b 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -3430,7 +3430,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 3430 | private void SetTerrain(float[] heightMap, Vector3 pOffset) | 3430 | private void SetTerrain(float[] heightMap, Vector3 pOffset) |
| 3431 | { | 3431 | { |
| 3432 | int startTime = Util.EnvironmentTickCount(); | 3432 | int startTime = Util.EnvironmentTickCount(); |
| 3433 | m_log.DebugFormat("[ODE SCENE]: Setting terrain for {0}", Name); | 3433 | m_log.DebugFormat("[ODE SCENE]: Setting terrain for {0} with offset {1}", Name, pOffset); |
| 3434 | 3434 | ||
| 3435 | // this._heightmap[i] = (double)heightMap[i]; | 3435 | // this._heightmap[i] = (double)heightMap[i]; |
| 3436 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around | 3436 | // dbm (danx0r) -- creating a buffer zone of one extra sample all around |
| @@ -3544,7 +3544,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 3544 | 3544 | ||
| 3545 | d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle); | 3545 | d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle); |
| 3546 | d.GeomSetRotation(GroundGeom, ref R); | 3546 | d.GeomSetRotation(GroundGeom, ref R); |
| 3547 | d.GeomSetPosition(GroundGeom, (pOffset.X + ((int)Constants.RegionSize * 0.5f)) - 1, (pOffset.Y + ((int)Constants.RegionSize * 0.5f)) - 1, 0); | 3547 | d.GeomSetPosition(GroundGeom, (pOffset.X + ((int)Constants.RegionSize * 0.5f)), (pOffset.Y + ((int)Constants.RegionSize * 0.5f)), 0); |
| 3548 | IntPtr testGround = IntPtr.Zero; | 3548 | IntPtr testGround = IntPtr.Zero; |
| 3549 | if (RegionTerrain.TryGetValue(pOffset, out testGround)) | 3549 | if (RegionTerrain.TryGetValue(pOffset, out testGround)) |
| 3550 | { | 3550 | { |