OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some compile

avinationmerge
UbitUmarov 2015-09-08 17:02:44 +01:00
parent 31afc76fcf
commit 774c42e7fb
25 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -933,7 +933,7 @@ namespace OpenSim.Region.Framework.Scenes
new EventManager.LandObjectRemoved(simDataService.RemoveLandObject); new EventManager.LandObjectRemoved(simDataService.RemoveLandObject);
m_sceneGraph = new SceneGraph(this); m_sceneGraph = new SceneGraph(this);
m_sceneGraph.PhysicsScene = physicsScene; m_sceneGraph.PhysicsScene = PhysicsScene;
// If the scene graph has an Unrecoverable error, restart this sim. // If the scene graph has an Unrecoverable error, restart this sim.
// Currently the only thing that causes it to happen is two kinds of specific // Currently the only thing that causes it to happen is two kinds of specific

2
OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs
View File

@ -33,7 +33,7 @@ using log4net;
using OMV = OpenMetaverse; using OMV = OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase; using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
namespace OpenSim.Region.PhysicsModule.BulletS namespace OpenSim.Region.PhysicsModule.BulletS
{ {

2
OpenSim/Region/PhysicsModules/BulletS/BSShapeCollection.cs
View File

@ -30,7 +30,7 @@ using System.Text;
using OMV = OpenMetaverse; using OMV = OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase; using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
namespace OpenSim.Region.PhysicsModule.BulletS namespace OpenSim.Region.PhysicsModule.BulletS
{ {

2
OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs
View File

@ -32,7 +32,7 @@ using System.Text;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.PhysicsModules.SharedBase; using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModules.Meshing; using OpenSim.Region.PhysicsModules.Meshing;
using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
using OMV = OpenMetaverse; using OMV = OpenMetaverse;

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/CTri.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class Wpoint public class Wpoint
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Concavity.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public static class Concavity public static class Concavity
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexBuilder.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class DecompDesc public class DecompDesc
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexDecomposition.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public delegate void ConvexDecompositionCallback(ConvexResult result); public delegate void ConvexDecompositionCallback(ConvexResult result);

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/ConvexResult.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class ConvexResult public class ConvexResult
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullClasses.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class HullResult public class HullResult
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullTriangle.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class HullTriangle : int3 public class HullTriangle : int3
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/HullUtils.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public static class HullUtils public static class HullUtils
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Plane.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class Plane public class Plane
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/PlaneTri.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public enum PlaneTriResult : int public enum PlaneTriResult : int
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Quaternion.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class Quaternion : float4 public class Quaternion : float4
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/SplitPlane.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class Rect3d public class Rect3d
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/VertexLookup.cs
View File

@ -28,7 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class VertexPool public class VertexPool
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float2.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float2 public class float2
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float3 : IEquatable<float3> public class float3 : IEquatable<float3>
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float3x3.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float3x3 public class float3x3
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float4 public class float4
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/float4x4.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class float4x4 public class float4x4
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int3.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class int3 public class int3
{ {

2
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/int4.cs
View File

@ -27,7 +27,7 @@
using System; using System;
namespace OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet namespace OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet
{ {
public class int4 public class int4
{ {

1
OpenSim/Region/PhysicsModules/UbitMeshing/Meshmerizer.cs
View File

@ -32,6 +32,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.PhysicsModules.SharedBase; using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
using System.Drawing; using System.Drawing;