From 9a919bac3ff4dc2c27fe9146781421e704e00fb6 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 9 Sep 2015 15:07:35 +0100 Subject: demote ConvexDecompositionDotNet to a simple dll, i had made it a region module --- OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs | 2 +- OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | 2 +- 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 +- .../ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | 4 ---- 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/UbitMeshing/Meshmerizer.cs | 2 +- 24 files changed, 23 insertions(+), 27 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs index 6f27ac7..436ea75 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.PhysicsModule.ConvexDecompositionDotNet; +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 37cee20..e791b27 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs @@ -32,7 +32,7 @@ using System.Text; using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; using OpenSim.Region.PhysicsModule.Meshing; -using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; +using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; using OMV = OpenMetaverse; diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs index 7ad689e..3d81439 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class Wpoint { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs index 4140d25..6a98535 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public static class Concavity { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs index 70c3a2b..4480036 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class DecompDesc { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs index 5046bce..e6dc98a 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public delegate void ConvexDecompositionCallback(ConvexResult result); diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs index 44e3e50..09129ed 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class ConvexResult { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs index 8a0164e..7d342d1 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class HullResult { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs index d3f0052..66457ac 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class HullTriangle : int3 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs index 3903254..b0bbfb9 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public static class HullUtils { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs index da9ae0c..f58cad6 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class Plane { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs index 42f7a22..8f08ddf 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public enum PlaneTriResult : int { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs index c6ab386..113f547 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs @@ -1,7 +1,6 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Mono.Addins; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -34,6 +33,3 @@ using Mono.Addins; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("0.8.2.*")] - -[assembly: Addin("OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet", OpenSim.VersionInfo.VersionNumber)] -[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)] diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs index 045f620..2d72117 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class Quaternion : float4 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs index 9f56bc5..cc5f99c 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class Rect3d { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs index bfe11e5..da2255e 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class VertexPool { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs index e7358c1..2a58ec4 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class float2 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs index fde9b32..64a9ef8 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class float3 : IEquatable { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs index c420fde..266ed0b 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class float3x3 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs index b2b6fd3..058934d 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class float4 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs index 087eba7..58f4f58 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.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class float4x4 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs index 90624eb..b3d4ecb 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class int3 { diff --git a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs index e9320c0..41e0912 100644 --- a/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs +++ b/OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs @@ -27,7 +27,7 @@ using System; -namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet +namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet { public class int4 { diff --git a/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs index 0bbd0db..ea86bb3 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.PhysicsModule.ConvexDecompositionDotNet; +using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; using OpenMetaverse; using OpenMetaverse.StructuredData; using System.Drawing; -- cgit v1.1