diff options
author | Dr Scofield | 2008-06-27 23:03:39 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 23:03:39 +0000 |
commit | 748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch) | |
tree | 58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Region/Physics | |
parent | more warnings to go. (diff) | |
download | opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2 opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz |
last round of warning squashing. calling it a day now.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/HelperTypes.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/HelperTypes.cs b/OpenSim/Region/Physics/Meshing/HelperTypes.cs index aed6c45..5d9823c 100644 --- a/OpenSim/Region/Physics/Meshing/HelperTypes.cs +++ b/OpenSim/Region/Physics/Meshing/HelperTypes.cs | |||
@@ -192,7 +192,10 @@ public class Vertex : PhysicsVector, IComparable<Vertex> | |||
192 | { | 192 | { |
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 | ||
197 | // operator but should not according to C# language spec | ||
198 | #pragma warning disable 0108 | ||
196 | public static Vertex operator *(Vertex v, Quaternion q) | 199 | public static Vertex operator *(Vertex v, Quaternion q) |
197 | { | 200 | { |
198 | Matrix4 tm = q.computeMatrix(); | 201 | Matrix4 tm = q.computeMatrix(); |
@@ -250,6 +253,7 @@ public class Vertex : PhysicsVector, IComparable<Vertex> | |||
250 | v1.Z *= mul; | 253 | v1.Z *= mul; |
251 | return v1; | 254 | return v1; |
252 | } | 255 | } |
256 | #pragma warning restore 0108 | ||
253 | 257 | ||
254 | 258 | ||
255 | public float dot(Vertex v) | 259 | public float dot(Vertex v) |