diff options
| author | Melanie | 2012-08-09 02:37:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-09 02:37:49 +0100 |
| commit | 6ed3761147ea6f8c4aaa561e291dcce7cb038df1 (patch) | |
| tree | 74fc55a790a575c4afeae7e463816e72cae925f3 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: Added avatar capsule scaling for size of avatar. (diff) | |
| download | opensim-SC-6ed3761147ea6f8c4aaa561e291dcce7cb038df1.zip opensim-SC-6ed3761147ea6f8c4aaa561e291dcce7cb038df1.tar.gz opensim-SC-6ed3761147ea6f8c4aaa561e291dcce7cb038df1.tar.bz2 opensim-SC-6ed3761147ea6f8c4aaa561e291dcce7cb038df1.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 4e05df6..86fc9d2 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -158,6 +158,7 @@ public struct ConfigurationParameters | |||
| 158 | public float avatarContactProcessingThreshold; | 158 | public float avatarContactProcessingThreshold; |
| 159 | 159 | ||
| 160 | public float maxPersistantManifoldPoolSize; | 160 | public float maxPersistantManifoldPoolSize; |
| 161 | public float maxCollisionAlgorithmPoolSize; | ||
| 161 | public float shouldDisableContactPoolDynamicAllocation; | 162 | public float shouldDisableContactPoolDynamicAllocation; |
| 162 | public float shouldForceUpdateAllAabbs; | 163 | public float shouldForceUpdateAllAabbs; |
| 163 | public float shouldRandomizeSolverOrder; | 164 | public float shouldRandomizeSolverOrder; |