aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-11 18:02:22 +0000
committerJustin Clarke Casey2009-03-11 18:02:22 +0000
commitacad0328b2c50d22fe76ebb7c8de2c97c856b42f (patch)
tree2379c1ae60c22a4dcee162c5b56d21f367c05bfd /OpenSim/Region/Physics
parent* Fix silly windows prebuild borkage. To use System.Xml, the project must ha... (diff)
downloadopensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.zip
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.gz
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.bz2
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.xz
* Make all coded defaults match settings in OpenSim.ini.example
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using * OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 601cd82..732d99b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -366,8 +366,8 @@ namespace OpenSim.Region.Physics.OdePlugin
366 gravityy = physicsconfig.GetFloat("world_gravityy", 0f); 366 gravityy = physicsconfig.GetFloat("world_gravityy", 0f);
367 gravityz = physicsconfig.GetFloat("world_gravityz", -9.8f); 367 gravityz = physicsconfig.GetFloat("world_gravityz", -9.8f);
368 368
369 worldHashspaceLow = physicsconfig.GetInt("world_hashspace_low", -4); 369 worldHashspaceLow = physicsconfig.GetInt("world_hashspace_size_low", -4);
370 worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_high", 128); 370 worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_size_high", 128);
371 371
372 metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f); 372 metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f);
373 smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4); 373 smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4);
@@ -380,7 +380,7 @@ namespace OpenSim.Region.Physics.OdePlugin
380 nmTerrainContactERP = physicsconfig.GetFloat("nm_terraincontact_erp", 0.1025f); 380 nmTerrainContactERP = physicsconfig.GetFloat("nm_terraincontact_erp", 0.1025f);
381 381
382 mTerrainContactFriction = physicsconfig.GetFloat("m_terraincontact_friction", 75f); 382 mTerrainContactFriction = physicsconfig.GetFloat("m_terraincontact_friction", 75f);
383 mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.1f); 383 mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.05f);
384 mTerrainContactERP = physicsconfig.GetFloat("m_terraincontact_erp", 0.05025f); 384 mTerrainContactERP = physicsconfig.GetFloat("m_terraincontact_erp", 0.05025f);
385 385
386 nmAvatarObjectContactFriction = physicsconfig.GetFloat("objectcontact_friction", 250f); 386 nmAvatarObjectContactFriction = physicsconfig.GetFloat("objectcontact_friction", 250f);
@@ -411,7 +411,7 @@ namespace OpenSim.Region.Physics.OdePlugin
411 meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", true); 411 meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", true);
412 meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f); 412 meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f);
413 MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f); 413 MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f);
414 m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", true); 414 m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false);
415 415
416 if (Environment.OSVersion.Platform == PlatformID.Unix) 416 if (Environment.OSVersion.Platform == PlatformID.Unix)
417 { 417 {