diff options
author | UbitUmarov | 2012-08-07 17:42:29 +0100 |
---|---|---|
committer | UbitUmarov | 2012-08-07 17:42:29 +0100 |
commit | eef6bb97c0f96a98468c44bae5392c9d129bfb1f (patch) | |
tree | 4f42b1843e0806bad01ccf6d39e4de813547638f /OpenSim/Region/Physics/Manager | |
parent | *** TESTTTTT ** downgrade from .net 4.0 to .net3.5 (diff) | |
download | opensim-SC_OLD-eef6bb97c0f96a98468c44bae5392c9d129bfb1f.zip opensim-SC_OLD-eef6bb97c0f96a98468c44bae5392c9d129bfb1f.tar.gz opensim-SC_OLD-eef6bb97c0f96a98468c44bae5392c9d129bfb1f.tar.bz2 opensim-SC_OLD-eef6bb97c0f96a98468c44bae5392c9d129bfb1f.tar.xz |
use a bit more complex mesh key identifier, plus a bug fix
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/IMesher.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index 19aa747..a8c99f7 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Runtime.InteropServices; | ||
30 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
31 | using OpenMetaverse; | 32 | using OpenMetaverse; |
32 | 33 | ||
@@ -56,6 +57,17 @@ namespace OpenSim.Region.Physics.Manager | |||
56 | { | 57 | { |
57 | } | 58 | } |
58 | 59 | ||
60 | [StructLayout(LayoutKind.Explicit)] | ||
61 | public struct AMeshKey | ||
62 | { | ||
63 | [FieldOffset(0)] | ||
64 | public UUID uuid; | ||
65 | [FieldOffset(0)] | ||
66 | public ulong hashA; | ||
67 | [FieldOffset(8)] | ||
68 | public ulong hashB; | ||
69 | } | ||
70 | |||
59 | public interface IMesh | 71 | public interface IMesh |
60 | { | 72 | { |
61 | List<Vector3> getVertexList(); | 73 | List<Vector3> getVertexList(); |