aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorubit2012-10-13 00:47:06 +0200
committerubit2012-10-13 00:47:06 +0200
commit2034a096a638e44585937447116fe74fdb1b826e (patch)
tree44b27f4a78b31e2f8788d8e91665ae30a8de160e /OpenSim
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentmissing file (diff)
downloadopensim-SC_OLD-2034a096a638e44585937447116fe74fdb1b826e.zip
opensim-SC_OLD-2034a096a638e44585937447116fe74fdb1b826e.tar.gz
opensim-SC_OLD-2034a096a638e44585937447116fe74fdb1b826e.tar.bz2
opensim-SC_OLD-2034a096a638e44585937447116fe74fdb1b826e.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/Manager/IMesher.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs
index fdba6ee..d7ab20b 100644
--- a/OpenSim/Region/Physics/Manager/IMesher.cs
+++ b/OpenSim/Region/Physics/Manager/IMesher.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Region.Physics.Manager
58 { 58 {
59 } 59 }
60 60
61 [Serializable()]
61 [StructLayout(LayoutKind.Explicit)] 62 [StructLayout(LayoutKind.Explicit)]
62 public struct AMeshKey 63 public struct AMeshKey
63 { 64 {
@@ -67,6 +68,11 @@ namespace OpenSim.Region.Physics.Manager
67 public ulong hashA; 68 public ulong hashA;
68 [FieldOffset(8)] 69 [FieldOffset(8)]
69 public ulong hashB; 70 public ulong hashB;
71
72 public override string ToString()
73 {
74 return uuid.ToString();
75 }
70 } 76 }
71 77
72 public interface IMesh 78 public interface IMesh