aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-10-21 01:41:04 +0100
committerUbitUmarov2015-10-21 01:41:04 +0100
commit44deac4c1e605fbe6b4f6535dd3e4c4a4ad07da1 (patch)
tree1916f12603108e2afb57c225f2a27fc253a4860a
parent we do not have prims with size 2^128... (diff)
downloadopensim-SC_OLD-44deac4c1e605fbe6b4f6535dd3e4c4a4ad07da1.zip
opensim-SC_OLD-44deac4c1e605fbe6b4f6535dd3e4c4a4ad07da1.tar.gz
opensim-SC_OLD-44deac4c1e605fbe6b4f6535dd3e4c4a4ad07da1.tar.bz2
opensim-SC_OLD-44deac4c1e605fbe6b4f6535dd3e4c4a4ad07da1.tar.xz
we do not have prims with size 2^128, missing file
-rw-r--r--OpenSim/Region/PhysicsModules/Ode/OdeScene.cs17
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
index 59b8d65..86ec817 100644
--- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
@@ -292,11 +292,8 @@ namespace OpenSim.Region.PhysicsModule.ODE
292 292
293 private float contactsurfacelayer = 0.001f; 293 private float contactsurfacelayer = 0.001f;
294 294
295 private int worldHashspaceLow = -4; 295 private int HashspaceLow = -5;
296 private int worldHashspaceHigh = 128; 296 private int HashspaceHigh = 12;
297
298 private int smallHashspaceLow = -4;
299 private int smallHashspaceHigh = 66;
300 297
301 private float waterlevel = 0f; 298 private float waterlevel = 0f;
302 private int framecount = 0; 299 private int framecount = 0;
@@ -648,12 +645,10 @@ namespace OpenSim.Region.PhysicsModule.ODE
648 avatarTerminalVelocity, AvatarTerminalVelocity); 645 avatarTerminalVelocity, AvatarTerminalVelocity);
649 } 646 }
650 647
651 worldHashspaceLow = physicsconfig.GetInt("world_hashspace_size_low", -4); 648 HashspaceLow = physicsconfig.GetInt("world_hashspace_level_low", -5);
652 worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_size_high", 128); 649 HashspaceHigh = physicsconfig.GetInt("world_hashspace_level_high", 12);
653 650
654 metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f); 651 metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f);
655 smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4);
656 smallHashspaceHigh = physicsconfig.GetInt("small_hashspace_size_high", 66);
657 652
658 contactsurfacelayer = physicsconfig.GetFloat("world_contact_surface_layer", 0.001f); 653 contactsurfacelayer = physicsconfig.GetFloat("world_contact_surface_layer", 0.001f);
659 654
@@ -904,7 +899,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
904 m_materialContacts[(int)Material.Rubber, 1].surface.soft_cfm = 0.010f; 899 m_materialContacts[(int)Material.Rubber, 1].surface.soft_cfm = 0.010f;
905 m_materialContacts[(int)Material.Rubber, 1].surface.soft_erp = 0.010f; 900 m_materialContacts[(int)Material.Rubber, 1].surface.soft_erp = 0.010f;
906 901
907 d.HashSpaceSetLevels(space, worldHashspaceLow, worldHashspaceHigh); 902 d.HashSpaceSetLevels(space, HashspaceLow, HashspaceHigh);
908 903
909 // Set the gravity,, don't disable things automatically (we set it explicitly on some things) 904 // Set the gravity,, don't disable things automatically (we set it explicitly on some things)
910 905
@@ -2703,7 +2698,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
2703 if (newspace == IntPtr.Zero) 2698 if (newspace == IntPtr.Zero)
2704 { 2699 {
2705 newspace = createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]); 2700 newspace = createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]);
2706 d.HashSpaceSetLevels(newspace, smallHashspaceLow, smallHashspaceHigh); 2701 d.HashSpaceSetLevels(newspace, HashspaceLow, HashspaceHigh);
2707 } 2702 }
2708 2703
2709 return newspace; 2704 return newspace;