diff options
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Meshing/HelperTypes.cs | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index c87e748..22e21a5 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -100,6 +100,7 @@ namespace OpenSim.Region.Physics.Manager | |||
100 | public delegate void CollisionUpdate(EventArgs e); | 100 | public delegate void CollisionUpdate(EventArgs e); |
101 | public delegate void OutOfBounds(PhysicsVector pos); | 101 | public delegate void OutOfBounds(PhysicsVector pos); |
102 | 102 | ||
103 | // disable warning: public events | ||
103 | #pragma warning disable 67 | 104 | #pragma warning disable 67 |
104 | public event PositionUpdate OnPositionUpdate; | 105 | public event PositionUpdate OnPositionUpdate; |
105 | public event VelocityUpdate OnVelocityUpdate; | 106 | public event VelocityUpdate OnVelocityUpdate; |
diff --git a/OpenSim/Region/Physics/Meshing/HelperTypes.cs b/OpenSim/Region/Physics/Meshing/HelperTypes.cs index 5d9823c..418baf5 100644 --- a/OpenSim/Region/Physics/Meshing/HelperTypes.cs +++ b/OpenSim/Region/Physics/Meshing/HelperTypes.cs | |||
@@ -193,9 +193,10 @@ public class Vertex : PhysicsVector, IComparable<Vertex> | |||
193 | return new Vertex(Y * v.Z - Z * v.Y, Z * v.X - X * v.Z, X * v.Y - Y * v.X); | 193 | return new Vertex(Y * v.Z - Z * v.Y, Z * v.X - X * v.Z, X * v.Y - Y * v.X); |
194 | } | 194 | } |
195 | 195 | ||
196 | // mono compiler moans about overloading operators hiding base | 196 | // disable warning: mono compiler moans about overloading |
197 | // operator but should not according to C# language spec | 197 | // operators hiding base operator but should not according to C# |
198 | #pragma warning disable 0108 | 198 | // language spec |
199 | #pragma warning disable 0108 | ||
199 | public static Vertex operator *(Vertex v, Quaternion q) | 200 | public static Vertex operator *(Vertex v, Quaternion q) |
200 | { | 201 | { |
201 | Matrix4 tm = q.computeMatrix(); | 202 | Matrix4 tm = q.computeMatrix(); |
@@ -253,7 +254,7 @@ public class Vertex : PhysicsVector, IComparable<Vertex> | |||
253 | v1.Z *= mul; | 254 | v1.Z *= mul; |
254 | return v1; | 255 | return v1; |
255 | } | 256 | } |
256 | #pragma warning restore 0108 | 257 | #pragma warning restore 0108 |
257 | 258 | ||
258 | 259 | ||
259 | public float dot(Vertex v) | 260 | public float dot(Vertex v) |