diff options
| author | UbitUmarov | 2015-09-08 15:03:22 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-08 15:03:22 +0100 |
| commit | 5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch) | |
| tree | 03077685e44648264523e1851cd068d51a507e81 /OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs | |
| parent | add script events per sec stat, using the time report code, but ignoring the... (diff) | |
| parent | More 'everything is a module' merging. (diff) | |
| download | opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2 opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz | |
Merge branch 'mbworknew1' into ubitworkvarnew
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs (renamed from OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs b/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs index b4a3c48..2eb7ba6 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs | |||
| @@ -29,10 +29,10 @@ using System; | |||
| 29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
| 30 | using Ode.NET; | 30 | using Ode.NET; |
| 31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
| 32 | using OpenSim.Region.Physics.Manager; | 32 | using OpenSim.Region.PhysicsModules.SharedBase; |
| 33 | using OpenSim.Region.Physics.OdePlugin; | 33 | using OpenSim.Region.PhysicsModule.ODE; |
| 34 | 34 | ||
| 35 | namespace OpenSim.Region.Physics.OdePlugin | 35 | namespace OpenSim.Region.PhysicsModule.ODE |
| 36 | { | 36 | { |
| 37 | class OdePhysicsJoint : PhysicsJoint | 37 | class OdePhysicsJoint : PhysicsJoint |
| 38 | { | 38 | { |