diff options
| author | Justin Clark-Casey (justincc) | 2012-01-25 23:24:44 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-25 23:24:44 +0000 |
| commit | 8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8 (patch) | |
| tree | ccd2f22a184fc1c0007e0f1089639fa70e482aa6 /bin/OpenSimDefaults.ini | |
| parent | refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), R... (diff) | |
| parent | Update save oar and save iar help responses to reflect new -h|--home (diff) | |
| download | opensim-SC_OLD-8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8.zip opensim-SC_OLD-8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8.tar.gz opensim-SC_OLD-8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8.tar.bz2 opensim-SC_OLD-8e5502fdc267dfc9fdce4f84f88efc4868dcc1b8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index c226fb3..25a8da6 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -842,8 +842,9 @@ | |||
| 842 | DeactivationTime = 0.2 | 842 | DeactivationTime = 0.2 |
| 843 | LinearSleepingThreshold = 0.8 | 843 | LinearSleepingThreshold = 0.8 |
| 844 | AngularSleepingThreshold = 1.0 | 844 | AngularSleepingThreshold = 1.0 |
| 845 | CcdMotionThreshold = 0.5 | 845 | CcdMotionThreshold = 0.0 |
| 846 | CcdSweptSphereRadius = 0.2 | 846 | CcdSweptSphereRadius = 0.0 |
| 847 | ContactProcessingThreshold = 0.1 | ||
| 847 | 848 | ||
| 848 | ; Whether to mesh sculpties | 849 | ; Whether to mesh sculpties |
| 849 | MeshSculptedPrim = true | 850 | MeshSculptedPrim = true |