aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2009-09-16 17:57:31 +0100
committerMelanie2009-09-16 17:57:31 +0100
commit5068404505d037d1dca93b38ba69b87822531302 (patch)
tree42048b7a9a3a127f482fdf028117e8977fe75fb5 /OpenSim/Region/Application
parentAdd the migration for scoping grid data (diff)
parentswitch default physics engine to ODE and default meshmerizer to Meshmerizer i... (diff)
downloadopensim-SC_OLD-5068404505d037d1dca93b38ba69b87822531302.zip
opensim-SC_OLD-5068404505d037d1dca93b38ba69b87822531302.tar.gz
opensim-SC_OLD-5068404505d037d1dca93b38ba69b87822531302.tar.bz2
opensim-SC_OLD-5068404505d037d1dca93b38ba69b87822531302.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs4
1 files changed, 2 insertions, 2 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);