aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-16 18:44:55 +0100
committerJustin Clark-Casey (justincc)2009-09-16 18:44:55 +0100
commit077d01c2255009a1e47e8bed42375ce81b770ef9 (patch)
tree5f3e553a31765a49a87b783baa515f63c01f4941
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-077d01c2255009a1e47e8bed42375ce81b770ef9.zip
opensim-SC_OLD-077d01c2255009a1e47e8bed42375ce81b770ef9.tar.gz
opensim-SC_OLD-077d01c2255009a1e47e8bed42375ce81b770ef9.tar.bz2
opensim-SC_OLD-077d01c2255009a1e47e8bed42375ce81b770ef9.tar.xz
switch default physics engine to ODE and default meshmerizer to Meshmerizer in code and in OpenSim.ini.example
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs4
-rw-r--r--bin/OpenSim.ini.example23
2 files changed, 16 insertions, 11 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index c3e7b86..21edcc5 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -305,8 +305,8 @@ namespace OpenSim
305 config.Set("region_info_source", "filesystem"); 305 config.Set("region_info_source", "filesystem");
306 306
307 config.Set("gridmode", false); 307 config.Set("gridmode", false);
308 config.Set("physics", "basicphysics"); 308 config.Set("physics", "OpenDynamicsEngine");
309 config.Set("meshing", "ZeroMesher"); 309 config.Set("meshing", "Meshmerizer");
310 config.Set("physical_prim", true); 310 config.Set("physical_prim", true);
311 config.Set("see_into_this_sim_from_neighbor", true); 311 config.Set("see_into_this_sim_from_neighbor", true);
312 config.Set("serverside_object_permissions", false); 312 config.Set("serverside_object_permissions", false);
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 8582a6c..d38c511 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -134,19 +134,24 @@
134 ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true. 134 ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true.
135 physical_prim = true 135 physical_prim = true
136 136
137 ; Select a mesher here. ZeroMesher is safe and fast. 137 ; Select a mesher here.
138 ; ZeroMesher also means that the physics engine models the physics of prims
139 ; sticking to the basic shapes the engine does support. Usually this is only a box.
140 ; Meshmerizer gives a better handling of complex prims by using triangle meshes.
141 ; Note that only ODE physics currently deals with meshed prims in a satisfactory way
142 ; 138 ;
143 meshing = ZeroMesher 139 ; Meshmerizer properly handles complex prims by using triangle meshes.
144 ;meshing = Meshmerizer 140 ; Note that only the ODE physics engine currently deals with meshed prims in a satisfactory way
141 ;
142 ; ZeroMesher is faster but leaves the physics engine to model the mesh using the basic shapes that it supports
143 ; Usually this is only a box
144
145 meshing = Meshmerizer
146 ;meshing = ZeroMesher
145 147
146 ; Choose one of the physics engines below 148 ; Choose one of the physics engines below
147 physics = basicphysics 149 ; OpenDynamicsEngine is by some distance the most developed physics engine
150 ; basicphysics effectively does not model physics at all, making all objects phantom
151
152 physics = OpenDynamicsEngine
153 ;physics = basicphysics
148 ;physics = POS 154 ;physics = POS
149 ;physics = OpenDynamicsEngine
150 ;physics = modified_BulletX 155 ;physics = modified_BulletX
151 156
152 ; ## 157 ; ##