From 71d221cdc090cdedf371ead534421bb7074908cd Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 18 Oct 2011 17:35:58 +0100 Subject: Remove the unused CollisionLocker from ODE Despite its name, this wasn't actually being used in any collision checking --- OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs') diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 771a2ea..0462866 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs @@ -144,7 +144,10 @@ namespace OpenSim.Region.Physics.OdePlugin internal UUID m_uuid { get; private set; } internal bool bad = false; - public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, CollisionLocker dode, Vector3 size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor) + public OdeCharacter( + String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, + float capsule_radius, float tensor, float density, float height_fudge_factor, + float walk_divisor, float rundivisor) { m_uuid = UUID.Random(); -- cgit v1.1