diff options
| author | Mic Bowman | 2011-04-13 15:31:12 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-13 15:31:12 -0700 |
| commit | 4c62203b3bded02a374dc37913df7d9d7e7f1fa3 (patch) | |
| tree | dcc517adcc10049054a4fe2b02aac3182c78db49 /bin | |
| parent | remove packet monitoring debugging code (diff) | |
| parent | Merge branch 'master' of /home/git/repo/OpenSim into queuetest (diff) | |
| download | opensim-SC-4c62203b3bded02a374dc37913df7d9d7e7f1fa3.zip opensim-SC-4c62203b3bded02a374dc37913df7d9d7e7f1fa3.tar.gz opensim-SC-4c62203b3bded02a374dc37913df7d9d7e7f1fa3.tar.bz2 opensim-SC-4c62203b3bded02a374dc37913df7d9d7e7f1fa3.tar.xz | |
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index f857b8d..107e859 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -154,7 +154,11 @@ | |||
| 154 | ; mesh, and use it for collisions. This is currently experimental code and enabling | 154 | ; mesh, and use it for collisions. This is currently experimental code and enabling |
| 155 | ; it may cause unexpected physics problems. | 155 | ; it may cause unexpected physics problems. |
| 156 | ;UseMeshiesPhysicsMesh = false | 156 | ;UseMeshiesPhysicsMesh = false |
| 157 | 157 | ||
| 158 | ; enable / disable Collada mesh support | ||
| 159 | ; default is true | ||
| 160 | ; ColladaMesh = true | ||
| 161 | |||
| 158 | ; Choose one of the physics engines below | 162 | ; Choose one of the physics engines below |
| 159 | ; OpenDynamicsEngine is by some distance the most developed physics engine | 163 | ; OpenDynamicsEngine is by some distance the most developed physics engine |
| 160 | ; basicphysics effectively does not model physics at all, making all objects phantom | 164 | ; basicphysics effectively does not model physics at all, making all objects phantom |