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/ODECharacter.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/ODECharacter.cs (renamed from OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/PhysicsModules/UbitOdePlugin/ODECharacter.cs index 0e2cbd2..ba38136 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/UbitOdePlugin/ODECharacter.cs | |||
| @@ -34,10 +34,10 @@ using System.Reflection; | |||
| 34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
| 35 | using OdeAPI; | 35 | using OdeAPI; |
| 36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
| 37 | using OpenSim.Region.Physics.Manager; | 37 | using OpenSim.Region.PhysicsModules.SharedBase; |
| 38 | using log4net; | 38 | using log4net; |
| 39 | 39 | ||
| 40 | namespace OpenSim.Region.Physics.OdePlugin | 40 | namespace OpenSim.Region.PhysicsModules.OdePlugin |
| 41 | { | 41 | { |
| 42 | /// <summary> | 42 | /// <summary> |
| 43 | /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. | 43 | /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. |