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/OdePlugin.cs | |
parent | Set enable_adaptive_throttles = true in OpenSimDefaults.ini (diff) | |
download | opensim-SC-71d221cdc090cdedf371ead534421bb7074908cd.zip opensim-SC-71d221cdc090cdedf371ead534421bb7074908cd.tar.gz opensim-SC-71d221cdc090cdedf371ead534421bb7074908cd.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index ebd46ab..716161a 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -48,14 +48,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
48 | { | 48 | { |
49 | //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 49 | //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
50 | 50 | ||
51 | private CollisionLocker m_ode; | ||
52 | private OdeScene m_scene; | 51 | private OdeScene m_scene; |
53 | 52 | ||
54 | public OdePlugin() | ||
55 | { | ||
56 | m_ode = new CollisionLocker(); | ||
57 | } | ||
58 | |||
59 | public bool Init() | 53 | public bool Init() |
60 | { | 54 | { |
61 | return true; | 55 | return true; |
@@ -69,7 +63,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
69 | // http://opensimulator.org/mantis/view.php?id=2750). | 63 | // http://opensimulator.org/mantis/view.php?id=2750). |
70 | d.InitODE(); | 64 | d.InitODE(); |
71 | 65 | ||
72 | m_scene = new OdeScene(m_ode, sceneIdentifier); | 66 | m_scene = new OdeScene(sceneIdentifier); |
73 | } | 67 | } |
74 | return (m_scene); | 68 | return (m_scene); |
75 | } | 69 | } |