diff options
| author | Melanie | 2013-07-13 00:47:58 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-13 00:47:58 +0100 |
| commit | a53a10ad270ea02e57aca7787d0b8278989eea68 (patch) | |
| tree | 7ff1b6d170e828e8b9628ef13078b2cd0ecbd8b6 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Centralize duplicated code in SceneObjectPart for subscribing to (diff) | |
| download | opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.zip opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.gz opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.bz2 opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index d09aa62..b4b7e7f 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; |