OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

we do not have prims with size 2^128, missing file

avinationmerge
UbitUmarov 2015-10-21 01:41:04 +01:00
parent d44bb7d009
commit 44deac4c1e
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
View File

@ -292,11 +292,8 @@ namespace OpenSim.Region.PhysicsModule.ODE
private float contactsurfacelayer = 0.001f; private float contactsurfacelayer = 0.001f;
private int worldHashspaceLow = -4; private int HashspaceLow = -5;
private int worldHashspaceHigh = 128; private int HashspaceHigh = 12;
private int smallHashspaceLow = -4;
private int smallHashspaceHigh = 66;
private float waterlevel = 0f; private float waterlevel = 0f;
private int framecount = 0; private int framecount = 0;
@ -648,12 +645,10 @@ namespace OpenSim.Region.PhysicsModule.ODE
avatarTerminalVelocity, AvatarTerminalVelocity); avatarTerminalVelocity, AvatarTerminalVelocity);
} }
worldHashspaceLow = physicsconfig.GetInt("world_hashspace_size_low", -4); HashspaceLow = physicsconfig.GetInt("world_hashspace_level_low", -5);
worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_size_high", 128); HashspaceHigh = physicsconfig.GetInt("world_hashspace_level_high", 12);
metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f); metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f);
smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4);
smallHashspaceHigh = physicsconfig.GetInt("small_hashspace_size_high", 66);
contactsurfacelayer = physicsconfig.GetFloat("world_contact_surface_layer", 0.001f); contactsurfacelayer = physicsconfig.GetFloat("world_contact_surface_layer", 0.001f);
@ -904,7 +899,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
m_materialContacts[(int)Material.Rubber, 1].surface.soft_cfm = 0.010f; m_materialContacts[(int)Material.Rubber, 1].surface.soft_cfm = 0.010f;
m_materialContacts[(int)Material.Rubber, 1].surface.soft_erp = 0.010f; m_materialContacts[(int)Material.Rubber, 1].surface.soft_erp = 0.010f;
d.HashSpaceSetLevels(space, worldHashspaceLow, worldHashspaceHigh); d.HashSpaceSetLevels(space, HashspaceLow, HashspaceHigh);
// Set the gravity,, don't disable things automatically (we set it explicitly on some things) // Set the gravity,, don't disable things automatically (we set it explicitly on some things)
@ -2703,7 +2698,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
if (newspace == IntPtr.Zero) if (newspace == IntPtr.Zero)
{ {
newspace = createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]); newspace = createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]);
d.HashSpaceSetLevels(newspace, smallHashspaceLow, smallHashspaceHigh); d.HashSpaceSetLevels(newspace, HashspaceLow, HashspaceHigh);
} }
return newspace; return newspace;