diff options
| author | Justin Clark-Casey (justincc) | 2012-02-13 20:48:50 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-13 20:48:50 +0000 |
| commit | 21393af631c743f0ee0094a20a9fa9f2aeb2e500 (patch) | |
| tree | dd74990b038ca912b6a0fe42a8a3305f9e51c7f2 /bin | |
| parent | On object deserialization, go back to logging errors at DEBUG level rather th... (diff) | |
| parent | correct the default avatar_terminal_velocity value that I accidentally left i... (diff) | |
| download | opensim-SC_OLD-21393af631c743f0ee0094a20a9fa9f2aeb2e500.zip opensim-SC_OLD-21393af631c743f0ee0094a20a9fa9f2aeb2e500.tar.gz opensim-SC_OLD-21393af631c743f0ee0094a20a9fa9f2aeb2e500.tar.bz2 opensim-SC_OLD-21393af631c743f0ee0094a20a9fa9f2aeb2e500.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 62fe9d4..3fd3d31 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -655,6 +655,11 @@ | |||
| 655 | world_gravityy = 0 | 655 | world_gravityy = 0 |
| 656 | world_gravityz = -9.8 | 656 | world_gravityz = -9.8 |
| 657 | 657 | ||
| 658 | ; Terminal velocity of a falling avatar | ||
| 659 | ; This is the same http://en.wikipedia.org/wiki/Terminal_velocity#Examples | ||
| 660 | ; Max value is 255, min value is 0 | ||
| 661 | avatar_terminal_velocity = 54 | ||
| 662 | |||
| 658 | ; World Step size. (warning these are dangerous. Changing these will probably cause your scene to explode dramatically) | 663 | ; World Step size. (warning these are dangerous. Changing these will probably cause your scene to explode dramatically) |
| 659 | ; reference: fps = (0.089/ODE_STEPSIZE) * 1000; | 664 | ; reference: fps = (0.089/ODE_STEPSIZE) * 1000; |
| 660 | world_stepsize = 0.0178 | 665 | world_stepsize = 0.0178 |