diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-15 13:10:21 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-15 13:10:21 -0400 |
| commit | 30ce56e7219b3d2ed16acb322cecec781c3776c5 (patch) | |
| tree | 3ab732fc9c8775a3fab0a705b4496ea21c1ab128 /OpenSim/Region/Physics | |
| parent | * part one of adding physics combining (diff) | |
| parent | * whoops, missing a / (diff) | |
| download | opensim-SC_OLD-30ce56e7219b3d2ed16acb322cecec781c3776c5.zip opensim-SC_OLD-30ce56e7219b3d2ed16acb322cecec781c3776c5.tar.gz opensim-SC_OLD-30ce56e7219b3d2ed16acb322cecec781c3776c5.tar.bz2 opensim-SC_OLD-30ce56e7219b3d2ed16acb322cecec781c3776c5.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 81f200a..00163f6 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -304,12 +304,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 304 | public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f); | 304 | public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f); |
| 305 | public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); | 305 | public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); |
| 306 | 306 | ||
| 307 | private uint heightmapWidth = m_regionWidth + 1; | 307 | // TODO: unused: private uint heightmapWidth = m_regionWidth + 1; |
| 308 | private uint heightmapHeight = m_regionHeight + 1; | 308 | // TODO: unused: private uint heightmapHeight = m_regionHeight + 1; |
| 309 | 309 | // TODO: unused: private uint heightmapWidthSamples; | |
| 310 | private uint heightmapWidthSamples; | 310 | // TODO: unused: private uint heightmapHeightSamples; |
| 311 | |||
| 312 | private uint heightmapHeightSamples; | ||
| 313 | 311 | ||
| 314 | private volatile int m_global_contactcount = 0; | 312 | private volatile int m_global_contactcount = 0; |
| 315 | 313 | ||