diff options
| author | Robert Adams | 2015-09-08 06:15:46 -0700 |
|---|---|---|
| committer | Robert Adams | 2015-09-08 06:15:46 -0700 |
| commit | 4dd17c4117ea413fb0c4418511956cb3abfe258c (patch) | |
| tree | 6f31a583610f8bf074d1f0b4e7ab6ccef37dec9a /OpenSim/Region/PhysicsModules/UbitOdePlugin/ODEPrim.cs | |
| parent | Merge of ubitworkvarnew with opensim/master as of 20150905. (diff) | |
| download | opensim-SC_OLD-4dd17c4117ea413fb0c4418511956cb3abfe258c.zip opensim-SC_OLD-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.gz opensim-SC_OLD-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.bz2 opensim-SC_OLD-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.xz | |
More 'everything is a module' merging.
Have most of UbitOde converted.
There are compile errors in OpenSimBase as the new modules stuff is not all there.
Removed ChOdePlugin as it's connection to OdePlugin was tangled.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/UbitOdePlugin/ODEPrim.cs (renamed from OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/PhysicsModules/UbitOdePlugin/ODEPrim.cs index 8bcdd89..b52a242 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/UbitOdePlugin/ODEPrim.cs | |||
| @@ -55,9 +55,9 @@ using log4net; | |||
| 55 | using OpenMetaverse; | 55 | using OpenMetaverse; |
| 56 | using OdeAPI; | 56 | using OdeAPI; |
| 57 | using OpenSim.Framework; | 57 | using OpenSim.Framework; |
| 58 | using OpenSim.Region.Physics.Manager; | 58 | using OpenSim.Region.PhysicsModules.SharedBase; |
| 59 | 59 | ||
| 60 | namespace OpenSim.Region.Physics.OdePlugin | 60 | namespace OpenSim.Region.PhysicsModules.OdePlugin |
| 61 | { | 61 | { |
| 62 | public class OdePrim : PhysicsActor | 62 | public class OdePrim : PhysicsActor |
| 63 | { | 63 | { |