diff options
| author | Melanie | 2012-01-26 00:21:21 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-26 00:21:21 +0000 |
| commit | 4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf (patch) | |
| tree | 6173c8da92084547e89db40e5762a74249b4a8db /bin/OpenSimDefaults.ini | |
| parent | Typo fix (diff) | |
| parent | refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento... (diff) | |
| download | opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.zip opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.gz opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.bz2 opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -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 6995410..9d9cc3a 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 |