aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-11-20 18:25:56 +0000
committerUbitUmarov2015-11-20 18:25:56 +0000
commit25983c1ba9428c5cd8aabb1f81381c60378db9ab (patch)
treee9d866ad0fa9009c4737c2434c73070d7301e5cb /OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
parentchange ScriptStopStrategy to the default value co-op (mantis 7740 (diff)
downloadopensim-SC-25983c1ba9428c5cd8aabb1f81381c60378db9ab.zip
opensim-SC-25983c1ba9428c5cd8aabb1f81381c60378db9ab.tar.gz
opensim-SC-25983c1ba9428c5cd8aabb1f81381c60378db9ab.tar.bz2
opensim-SC-25983c1ba9428c5cd8aabb1f81381c60378db9ab.tar.xz
remove the hard to maintain Ode.Net wrapper only in use by old ode
Diffstat (limited to 'OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs')
-rw-r--r--OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
index c1afe13..4c9df9c 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
@@ -29,7 +29,6 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse; 31using OpenMetaverse;
32using Ode.NET;
33using OpenSim.Framework; 32using OpenSim.Framework;
34using OpenSim.Region.PhysicsModules.SharedBase; 33using OpenSim.Region.PhysicsModules.SharedBase;
35using log4net; 34using log4net;
@@ -1105,8 +1104,8 @@ namespace OpenSim.Region.PhysicsModule.ODE
1105// lock (OdeScene.UniversalColliderSyncObject) 1104// lock (OdeScene.UniversalColliderSyncObject)
1106 Shell = d.CreateCapsule(_parent_scene.space, CAPSULE_RADIUS, CAPSULE_LENGTH); 1105 Shell = d.CreateCapsule(_parent_scene.space, CAPSULE_RADIUS, CAPSULE_LENGTH);
1107 1106
1108 d.GeomSetCategoryBits(Shell, (int)m_collisionCategories); 1107 d.GeomSetCategoryBits(Shell, (uint)m_collisionCategories);
1109 d.GeomSetCollideBits(Shell, (int)m_collisionFlags); 1108 d.GeomSetCollideBits(Shell, (uint)m_collisionFlags);
1110 1109
1111 d.MassSetCapsuleTotal(out ShellMass, m_mass, 2, CAPSULE_RADIUS, CAPSULE_LENGTH); 1110 d.MassSetCapsuleTotal(out ShellMass, m_mass, 2, CAPSULE_RADIUS, CAPSULE_LENGTH);
1112 Body = d.BodyCreate(_parent_scene.world); 1111 Body = d.BodyCreate(_parent_scene.world);