From 2c0cad6dd3014e9ad363090f5f7872c43daffcbd Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 30 Aug 2015 20:29:31 -0700 Subject: Renamed the namespaces too --- OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs | 4 ++-- OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | 4 ++-- OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs | 4 ++-- OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs | 4 ++-- OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs | 6 +++--- OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs | 4 ++-- OpenSim/Region/PhysicsModules/Ode/OdeScene.cs | 4 ++-- OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'OpenSim/Region/PhysicsModules/Ode') diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs index 05eaf2a..048ca44 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs @@ -31,10 +31,10 @@ using System.Reflection; using OpenMetaverse; using Ode.NET; using OpenSim.Framework; -using OpenSim.Region.Physics.Manager; +using OpenSim.Region.PhysicsModule.SharedBase; using log4net; -namespace OpenSim.Region.Physics.OdePlugin +namespace OpenSim.Region.PhysicsModule.ODE { /// /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs index 2342bfa..0b0c8a9 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs @@ -46,9 +46,9 @@ using log4net; using OpenMetaverse; using Ode.NET; using OpenSim.Framework; -using OpenSim.Region.Physics.Manager; +using OpenSim.Region.PhysicsModule.SharedBase; -namespace OpenSim.Region.Physics.OdePlugin +namespace OpenSim.Region.PhysicsModule.ODE { public class ODEDynamics { diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs index f934b8a..d8849e7 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs @@ -50,9 +50,9 @@ using log4net; using OpenMetaverse; using Ode.NET; using OpenSim.Framework; -using OpenSim.Region.Physics.Manager; +using OpenSim.Region.PhysicsModule.SharedBase; -namespace OpenSim.Region.Physics.OdePlugin +namespace OpenSim.Region.PhysicsModule.ODE { /// /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves. diff --git a/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs index 8d7d3b3..2bcdcd4 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODERayCastRequestManager.cs @@ -31,11 +31,11 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Text; using OpenMetaverse; -using OpenSim.Region.Physics.Manager; +using OpenSim.Region.PhysicsModule.SharedBase; using Ode.NET; using log4net; -namespace OpenSim.Region.Physics.OdePlugin +namespace OpenSim.Region.PhysicsModule.ODE { /// /// Processes raycast requests as ODE is in a state to be able to do them. diff --git a/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs b/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs index b4a3c48..5180583 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdePhysicsJoint.cs @@ -29,10 +29,10 @@ using System; using OpenMetaverse; using Ode.NET; using OpenSim.Framework; -using OpenSim.Region.Physics.Manager; -using OpenSim.Region.Physics.OdePlugin; +using OpenSim.Region.PhysicsModule.SharedBase; +using OpenSim.Region.PhysicsModule.ODE; -namespace OpenSim.Region.Physics.OdePlugin +namespace OpenSim.Region.PhysicsModule.ODE { class OdePhysicsJoint : PhysicsJoint { diff --git a/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs b/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs index 7e652fc..c3e01dd 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdePlugin.cs @@ -36,10 +36,10 @@ using log4net; using Nini.Config; using Ode.NET; using OpenSim.Framework; -using OpenSim.Region.Physics.Manager; +using OpenSim.Region.PhysicsModule.SharedBase; using OpenMetaverse; -namespace OpenSim.Region.Physics.OdePlugin +namespace OpenSim.Region.PhysicsModule.ODE { /// /// ODE plugin diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs index 5953557..e30036b 100644 --- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs @@ -44,9 +44,9 @@ using OpenMetaverse; using Drawstuff.NET; #endif using OpenSim.Framework; -using OpenSim.Region.Physics.Manager; +using OpenSim.Region.PhysicsModule.SharedBase; -namespace OpenSim.Region.Physics.OdePlugin +namespace OpenSim.Region.PhysicsModule.ODE { public enum StatusIndicators : int { diff --git a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs index 16404c6..09147b0 100644 --- a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs +++ b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs @@ -30,20 +30,20 @@ using Nini.Config; using NUnit.Framework; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Physics.Manager; -using OpenSim.Region.Physics.OdePlugin; +using OpenSim.Region.PhysicsModule.SharedBase; +using OpenSim.Region.PhysicsModule.ODE; using OpenSim.Tests.Common; using log4net; using System.Reflection; -namespace OpenSim.Region.Physics.OdePlugin.Tests +namespace OpenSim.Region.PhysicsModule.ODE.Tests { [TestFixture] public class ODETestClass : OpenSimTestCase { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private OpenSim.Region.Physics.OdePlugin.OdePlugin cbt; + private OpenSim.Region.PhysicsModule.ODE.OdePlugin cbt; private PhysicsScene ps; private IMeshingPlugin imp; -- cgit v1.1