diff options
| author | Melanie | 2011-12-20 21:51:43 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-20 21:51:43 +0000 |
| commit | ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5 (patch) | |
| tree | d89152b691685be8b93699fec8ac5d254c01bb53 /OpenSim/Region/Physics | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Though the viewer warns about receiving this, not sending appears to break ba... (diff) | |
| download | opensim-SC_OLD-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.zip opensim-SC_OLD-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.gz opensim-SC_OLD-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.bz2 opensim-SC_OLD-ca6113a4d5b76eb4d3b8a58335ccf939c6692ce5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Region/Physics')
| -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 f716687..04ba738 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 | { |