diff options
author | Justin Clark-Casey (justincc) | 2011-10-18 17:35:58 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-18 17:35:58 +0100 |
commit | 71d221cdc090cdedf371ead534421bb7074908cd (patch) | |
tree | 92a1d37b6b8764cfdfed05cdd7cd5fecaeeec53f /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
parent | Set enable_adaptive_throttles = true in OpenSimDefaults.ini (diff) | |
download | opensim-SC_OLD-71d221cdc090cdedf371ead534421bb7074908cd.zip opensim-SC_OLD-71d221cdc090cdedf371ead534421bb7074908cd.tar.gz opensim-SC_OLD-71d221cdc090cdedf371ead534421bb7074908cd.tar.bz2 opensim-SC_OLD-71d221cdc090cdedf371ead534421bb7074908cd.tar.xz |
Remove the unused CollisionLocker from ODE
Despite its name, this wasn't actually being used in any collision checking
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 5 |
1 files changed, 4 insertions, 1 deletions
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 | |||
144 | internal UUID m_uuid { get; private set; } | 144 | internal UUID m_uuid { get; private set; } |
145 | internal bool bad = false; | 145 | internal bool bad = false; |
146 | 146 | ||
147 | 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) | 147 | public OdeCharacter( |
148 | String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p, | ||
149 | float capsule_radius, float tensor, float density, float height_fudge_factor, | ||
150 | float walk_divisor, float rundivisor) | ||
148 | { | 151 | { |
149 | m_uuid = UUID.Random(); | 152 | m_uuid = UUID.Random(); |
150 | 153 | ||