From 40fd7cbf7478b4b3966ef49728974ba3f75512dd Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 8 Sep 2015 20:03:54 +0100 Subject: a mess with Modules and Module --- OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs | 2 +- OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs | 2 +- OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs | 2 +- OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs | 2 +- OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs | 2 +- OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs | 2 +- OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs | 3 ++- 7 files changed, 8 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/PhysicsModules/UbitOde') diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs index 0edc46f..5622e48 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODECharacter.cs @@ -37,7 +37,7 @@ using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; using log4net; -namespace OpenSim.Region.PhysicsModules.UbitOde +namespace OpenSim.Region.PhysicsModule.UbitOde { /// /// 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/UbitOde/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs index 89adab8..abe6f37 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEDynamics.cs @@ -50,7 +50,7 @@ using OdeAPI; using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; -namespace OpenSim.Region.PhysicsModules.UbitOde +namespace OpenSim.Region.PhysicsModule.UbitOde { public class ODEDynamics { diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs index 6fb10b1..330b191 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEMeshWorker.cs @@ -16,7 +16,7 @@ using log4net; using Nini.Config; using OpenMetaverse; -namespace OpenSim.Region.PhysicsModules.UbitOde +namespace OpenSim.Region.PhysicsModule.UbitOde { public enum MeshState : byte { diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs index 344cfcc..8e8e069 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODEPrim.cs @@ -57,7 +57,7 @@ using OdeAPI; using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; -namespace OpenSim.Region.PhysicsModules.UbitOde +namespace OpenSim.Region.PhysicsModule.UbitOde { public class OdePrim : PhysicsActor { diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs index eac4515..6b3672a 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODERayCastRequestManager.cs @@ -36,7 +36,7 @@ using OdeAPI; using log4net; using OpenMetaverse; -namespace OpenSim.Region.PhysicsModules.UbitOde +namespace OpenSim.Region.PhysicsModule.UbitOde { /// /// Processes raycast requests as ODE is in a state to be able to do them. diff --git a/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs b/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs index b1c758e..ef828de 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/ODESitAvatar.cs @@ -36,7 +36,7 @@ using OdeAPI; using log4net; using OpenMetaverse; -namespace OpenSim.Region.PhysicsModules.UbitOde +namespace OpenSim.Region.PhysicsModule.UbitOde { /// /// diff --git a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs index 4031f0d..7211774 100644 --- a/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs +++ b/OpenSim/Region/PhysicsModules/UbitOde/OdeScene.cs @@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.PhysicsModules.SharedBase; using OpenMetaverse; -namespace OpenSim.Region.PhysicsModules.UbitOde +namespace OpenSim.Region.PhysicsModule.UbitOde { // colision flags of things others can colide with // rays, sensors, probes removed since can't be colided with @@ -384,6 +384,7 @@ namespace OpenSim.Region.PhysicsModules.UbitOde PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; scene.RegisterModuleInterface(this); + Vector3 extent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); Initialization(extent); -- cgit v1.1