diff options
| author | Diva Canto | 2013-07-09 14:13:51 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-09 14:13:51 -0700 |
| commit | d0dfb744b206d3bd002ed72f415f177c6b04226b (patch) | |
| tree | dba29f24667d254371abb726e2842700c189dfdf /OpenSim/Region/Physics/OdePlugin | |
| parent | Put guards on a bunch of exception-inducing code, as seen in logs from load t... (diff) | |
| parent | BulletSim: add parameter to optionally disable vehicle linear deflection. (diff) | |
| download | opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.zip opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.gz opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.bz2 opensim-SC-d0dfb744b206d3bd002ed72f415f177c6b04226b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 0d66496..13c69d6 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -108,7 +108,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 108 | private Vector3 m_taintAngularLock = Vector3.One; | 108 | private Vector3 m_taintAngularLock = Vector3.One; |
| 109 | private IntPtr Amotor = IntPtr.Zero; | 109 | private IntPtr Amotor = IntPtr.Zero; |
| 110 | 110 | ||
| 111 | private object m_assetsLock = new object(); | ||
| 112 | private bool m_assetFailed = false; | 111 | private bool m_assetFailed = false; |
| 113 | 112 | ||
| 114 | private Vector3 m_PIDTarget; | 113 | private Vector3 m_PIDTarget; |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 07663b3..7e652fc 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -46,7 +46,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 46 | /// </summary> | 46 | /// </summary> |
| 47 | public class OdePlugin : IPhysicsPlugin | 47 | public class OdePlugin : IPhysicsPlugin |
| 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 OdeScene m_scene; | 51 | private OdeScene m_scene; |
| 52 | 52 | ||