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/BulletS/BSPrim.cs | 2 +- OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs | 1 - OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | 4 ++-- OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs | 4 ++-- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs | 2 +- .../Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs | 2 +- .../PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs | 2 +- .../Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs | 2 +- .../Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs | 2 +- .../Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs | 2 +- .../Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs | 2 +- OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs | 2 +- OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs | 2 +- OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs | 2 +- OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs | 2 +- OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs | 4 ++-- OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs | 2 +- OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs | 2 +- OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs | 2 +- OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs | 2 +- OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs | 4 ++-- 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 ++- 40 files changed, 44 insertions(+), 44 deletions(-) (limited to 'OpenSim/Region/PhysicsModules') diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index 436ea75..6f27ac7 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs @@ -33,7 +33,7 @@ using log4net; using OMV = OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; -using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; +using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; namespace OpenSim.Region.PhysicsModule.BulletS { diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs index 176b02c..4ec6f51 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs @@ -30,7 +30,6 @@ using System.Text; using OMV = OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; -using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; namespace OpenSim.Region.PhysicsModule.BulletS { diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs index 1c27c62..37cee20 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs @@ -31,8 +31,8 @@ using System.Text; using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; -using OpenSim.Region.PhysicsModules.Meshing; -using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; +using OpenSim.Region.PhysicsModule.Meshing; +using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; using OMV = OpenMetaverse; diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs index 4eeea4d..109e19c 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/BulletSimTestsUtil.cs @@ -34,7 +34,7 @@ using Nini.Config; using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; -using OpenSim.Region.PhysicsModules.Meshing; +using OpenSim.Region.PhysicsModule.Meshing; using OpenSim.Region.Framework.Interfaces; using OpenMetaverse; @@ -86,7 +86,7 @@ public static class BulletSimTestsUtil info.RegionSizeX = info.RegionSizeY = info.RegionSizeZ = Constants.RegionSize; OpenSim.Region.Framework.Scenes.Scene scene = new OpenSim.Region.Framework.Scenes.Scene(info); - IMesher mesher = new OpenSim.Region.PhysicsModules.Meshing.Meshmerizer(); + IMesher mesher = new OpenSim.Region.PhysicsModule.Meshing.Meshmerizer(); INonSharedRegionModule mod = mesher as INonSharedRegionModule; mod.Initialise(openSimINI); mod.AddRegion(scene); diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs index 3d81439..7ad689e 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class Wpoint { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs index 6a98535..4140d25 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public static class Concavity { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs index 4480036..70c3a2b 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class DecompDesc { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs index e6dc98a..5046bce 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public delegate void ConvexDecompositionCallback(ConvexResult result); diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs index 09129ed..44e3e50 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class ConvexResult { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs index 7d342d1..8a0164e 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class HullResult { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs index 66457ac..d3f0052 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class HullTriangle : int3 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs index b0bbfb9..3903254 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public static class HullUtils { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs index f58cad6..da9ae0c 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class Plane { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs index 8f08ddf..42f7a22 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public enum PlaneTriResult : int { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs index 2d72117..045f620 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class Quaternion : float4 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs index cc5f99c..9f56bc5 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class Rect3d { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs index da2255e..bfe11e5 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class VertexPool { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs index 2a58ec4..e7358c1 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class float2 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs index 64a9ef8..fde9b32 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class float3 : IEquatable { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs index 266ed0b..c420fde 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class float3x3 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs index 058934d..b2b6fd3 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class float4 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs index 58f4f58..087eba7 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs @@ -30,7 +30,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class float4x4 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs index b3d4ecb..90624eb 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class int3 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs index 41e0912..e9320c0 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet { public class int4 { diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs index 34a925d..a0e3b7f 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/HelperTypes.cs @@ -31,7 +31,7 @@ using System.Diagnostics; using System.Globalization; using OpenMetaverse; using OpenSim.Region.PhysicsModules.SharedBase; -using OpenSim.Region.PhysicsModules.Meshing; +using OpenSim.Region.PhysicsModule.Meshing; public class Vertex : IComparable { diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs index 8c97f2f..e63ad01 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Mesh.cs @@ -33,7 +33,7 @@ using OpenSim.Region.PhysicsModules.SharedBase; using PrimMesher; using OpenMetaverse; -namespace OpenSim.Region.PhysicsModules.Meshing +namespace OpenSim.Region.PhysicsModule.Meshing { public class Mesh : IMesh { diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs index bae3449..0d22e96 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs @@ -44,7 +44,7 @@ using log4net; using Nini.Config; using Mono.Addins; -namespace OpenSim.Region.PhysicsModules.Meshing +namespace OpenSim.Region.PhysicsModule.Meshing { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "Meshmerizer")] public class Meshmerizer : IMesher, INonSharedRegionModule diff --git a/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs index d6ac8b2..648a081 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ using Mono.Addins; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("OpenSim.Region.PhysicsModules.Meshing")] +[assembly: AssemblyTitle("OpenSim.Region.PhysicsModule.Meshing")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("http://opensimulator.org")] @@ -32,5 +32,5 @@ using Mono.Addins; // [assembly: AssemblyVersion("0.8.2.*")] -[assembly: Addin("OpenSim.Region.PhysicsModules.Meshing", OpenSim.VersionInfo.VersionNumber)] +[assembly: Addin("OpenSim.Region.PhysicsModule.Meshing", OpenSim.VersionInfo.VersionNumber)] [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] diff --git a/OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs b/OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs index 09676c6..dbf4f7e 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/ZeroMesher.cs @@ -47,7 +47,7 @@ using log4net; * it's always availabe and thus the default in case of configuration errors */ -namespace OpenSim.Region.PhysicsModules.Meshing +namespace OpenSim.Region.PhysicsModule.Meshing { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ZeroMesher")] diff --git a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs index 6dc22bd..483e044 100644 --- a/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs +++ b/OpenSim/Region/PhysicsModules/Ode/Tests/ODETestClass.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.PhysicsModule.ODE.Tests info.RegionSizeX = info.RegionSizeY = info.RegionSizeZ = Constants.RegionSize; OpenSim.Region.Framework.Scenes.Scene scene = new OpenSim.Region.Framework.Scenes.Scene(info); - //IMesher mesher = new OpenSim.Region.PhysicsModules.Meshing.Meshmerizer(); + //IMesher mesher = new OpenSim.Region.PhysicsModule.Meshing.Meshmerizer(); //INonSharedRegionModule mod = mesher as INonSharedRegionModule; //mod.Initialise(openSimINI); //mod.AddRegion(scene); diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs index 284d9fe..fb38cdb 100644 --- a/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs +++ b/OpenSim/Region/PhysicsModules/UbitMeshing/HelperTypes.cs @@ -31,7 +31,7 @@ using System.Diagnostics; using System.Globalization; using OpenMetaverse; using OpenSim.Region.PhysicsModules.SharedBase; -using OpenSim.Region.PhysicsModules.UbitMeshing; +using OpenSim.Region.PhysicsModule.UbitMeshing; public class Vertex : IComparable { diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs index 485de63..e3bfe77 100644 --- a/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs +++ b/OpenSim/Region/PhysicsModules/UbitMeshing/Mesh.cs @@ -35,7 +35,7 @@ using OpenMetaverse; using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters.Binary; -namespace OpenSim.Region.PhysicsModules.UbitMeshing +namespace OpenSim.Region.PhysicsModule.UbitMeshing { public class MeshBuildingData { diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs index 7318d31..60b0ce0 100644 --- a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs @@ -32,7 +32,7 @@ using OpenSim.Framework; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.PhysicsModules.SharedBase; -using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; +using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; using OpenMetaverse; using OpenMetaverse.StructuredData; using System.Drawing; @@ -49,7 +49,7 @@ using System.Runtime.Serialization.Formatters.Binary; using Mono.Addins; -namespace OpenSim.Region.PhysicsModules.UbitMeshing +namespace OpenSim.Region.PhysicsModule.UbitMeshing { [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UbitMeshmerizer")] public class UbitMeshmerizer : IMesher, INonSharedRegionModule 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