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/ODEPrim.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/ODEPrim.cs (renamed from OpenSim/Region/Physics/OdePlugin/ODEPrim.cs) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs index bf003a8..54a2033 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs | |||
| @@ -50,9 +50,9 @@ using log4net; | |||
| 50 | using OpenMetaverse; | 50 | using OpenMetaverse; |
| 51 | using Ode.NET; | 51 | using Ode.NET; |
| 52 | using OpenSim.Framework; | 52 | using OpenSim.Framework; |
| 53 | using OpenSim.Region.Physics.Manager; | 53 | using OpenSim.Region.PhysicsModules.SharedBase; |
| 54 | 54 | ||
| 55 | namespace OpenSim.Region.Physics.OdePlugin | 55 | namespace OpenSim.Region.PhysicsModule.ODE |
| 56 | { | 56 | { |
| 57 | /// <summary> | 57 | /// <summary> |
| 58 | /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. | 58 | /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. |
| @@ -3428,7 +3428,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 3428 | { | 3428 | { |
| 3429 | m_log.WarnFormat( | 3429 | m_log.WarnFormat( |
| 3430 | "[ODE PRIM]: Could not get mesh/sculpt asset {0} for {1} at {2} in {3}", | 3430 | "[ODE PRIM]: Could not get mesh/sculpt asset {0} for {1} at {2} in {3}", |
| 3431 | _pbs.SculptTexture, Name, _position, _parent_scene.Name); | 3431 | _pbs.SculptTexture, Name, _position, _parent_scene.PhysicsSceneName); |
| 3432 | } | 3432 | } |
| 3433 | } | 3433 | } |
| 3434 | } | 3434 | } |