diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-04 02:48:07 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-04 02:48:07 -0400 |
| commit | b93f512433a7e1fb4bd760bbf9d82bedfe898773 (patch) | |
| tree | 84f24e947c3caafbb6d5c6595825783ba4576665 | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC-b93f512433a7e1fb4bd760bbf9d82bedfe898773.zip opensim-SC-b93f512433a7e1fb4bd760bbf9d82bedfe898773.tar.gz opensim-SC-b93f512433a7e1fb4bd760bbf9d82bedfe898773.tar.bz2 opensim-SC-b93f512433a7e1fb4bd760bbf9d82bedfe898773.tar.xz | |
* Fix for GetTerrainHeightAtXY to make it compatible when Constants.RegionSize isn't 256
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 572412a..fea288e 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -1564,12 +1564,13 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1564 | m_parentScene = pScene; | 1564 | m_parentScene = pScene; |
| 1565 | 1565 | ||
| 1566 | } | 1566 | } |
| 1567 | // Recovered for use by fly height. Kitto Flora | 1567 | |
| 1568 | // Recovered for use by fly height. Kitto Flora | ||
| 1568 | public float GetTerrainHeightAtXY(float x, float y) | 1569 | public float GetTerrainHeightAtXY(float x, float y) |
| 1569 | { | 1570 | { |
| 1570 | 1571 | ||
| 1571 | int offsetX = ((int) (x/256)) * 256; | 1572 | int offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize; |
| 1572 | int offsetY = ((int) (y/256)) * 256; | 1573 | int offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize; |
| 1573 | 1574 | ||
| 1574 | IntPtr heightFieldGeom = IntPtr.Zero; | 1575 | IntPtr heightFieldGeom = IntPtr.Zero; |
| 1575 | 1576 | ||