aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
diff options
context:
space:
mode:
authorubit2012-12-11 05:49:52 +0100
committerubit2012-12-11 05:49:52 +0100
commit377e6f44e71a6a4b8dac9cdf2e671971b76b1605 (patch)
treeb0a6929372f6016c3cb885f3fb1aff6f552169c8 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent missing files remove some warnings... (diff)
downloadopensim-SC_OLD-377e6f44e71a6a4b8dac9cdf2e671971b76b1605.zip
opensim-SC_OLD-377e6f44e71a6a4b8dac9cdf2e671971b76b1605.tar.gz
opensim-SC_OLD-377e6f44e71a6a4b8dac9cdf2e671971b76b1605.tar.bz2
opensim-SC_OLD-377e6f44e71a6a4b8dac9cdf2e671971b76b1605.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index f8d7195..8878820 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -515,7 +515,7 @@ namespace OpenSim.Region.Physics.OdePlugin
515 odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f); 515 odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f);
516 516
517 ContactgeomsArray = Marshal.AllocHGlobal(contactsPerCollision * d.ContactGeom.unmanagedSizeOf); 517 ContactgeomsArray = Marshal.AllocHGlobal(contactsPerCollision * d.ContactGeom.unmanagedSizeOf);
518 GlobalContactsArray = GlobalContactsArray = Marshal.AllocHGlobal(maxContactsbeforedeath * d.Contact.unmanagedSizeOf); 518 GlobalContactsArray = Marshal.AllocHGlobal(maxContactsbeforedeath * d.Contact.unmanagedSizeOf);
519 519
520 m_materialContactsData[(int)Material.Stone].mu = 0.8f; 520 m_materialContactsData[(int)Material.Stone].mu = 0.8f;
521 m_materialContactsData[(int)Material.Stone].bounce = 0.4f; 521 m_materialContactsData[(int)Material.Stone].bounce = 0.4f;