diff options
| author | Mic Bowman | 2013-02-08 22:43:56 -0800 |
|---|---|---|
| committer | Mic Bowman | 2013-02-08 22:43:56 -0800 |
| commit | 0a297a0e52b673427ff61b254f6065c217b1375d (patch) | |
| tree | aa337fff2dfda8677a7a76eb08b76a1d07df178a /OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |
| parent | Make JsonStore path parsing more robust. Should fix the (diff) | |
| parent | Fixed ReadSculptData(): the check whether there are enough bytes to read was ... (diff) | |
| download | opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.zip opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.tar.gz opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.tar.bz2 opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index 5e06c1e..7ab86d2 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
| @@ -183,6 +183,7 @@ public struct ConfigurationParameters | |||
| 183 | public float shouldEnableFrictionCaching; | 183 | public float shouldEnableFrictionCaching; |
| 184 | public float numberOfSolverIterations; | 184 | public float numberOfSolverIterations; |
| 185 | public float useSingleSidedMeshes; | 185 | public float useSingleSidedMeshes; |
| 186 | public float globalContactBreakingThreshold; | ||
| 186 | 187 | ||
| 187 | public float physicsLoggingFrames; | 188 | public float physicsLoggingFrames; |
| 188 | 189 | ||