aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorubit2012-10-13 01:43:44 +0200
committerubit2012-10-13 01:43:44 +0200
commitfdd6e0361ef9bd773d99ff13cf6b291e9ded11bf (patch)
treea050b3c4ac1111a20091300edacab493b0b2b333
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentlonger meshs identification keys, so first part on disk cache is it's asset id (diff)
downloadopensim-SC-fdd6e0361ef9bd773d99ff13cf6b291e9ded11bf.zip
opensim-SC-fdd6e0361ef9bd773d99ff13cf6b291e9ded11bf.tar.gz
opensim-SC-fdd6e0361ef9bd773d99ff13cf6b291e9ded11bf.tar.bz2
opensim-SC-fdd6e0361ef9bd773d99ff13cf6b291e9ded11bf.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
-rw-r--r--OpenSim/Region/Physics/Manager/IMesher.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs
index d7ab20b..d0e3996 100644
--- a/OpenSim/Region/Physics/Manager/IMesher.cs
+++ b/OpenSim/Region/Physics/Manager/IMesher.cs
@@ -68,10 +68,12 @@ namespace OpenSim.Region.Physics.Manager
68 public ulong hashA; 68 public ulong hashA;
69 [FieldOffset(8)] 69 [FieldOffset(8)]
70 public ulong hashB; 70 public ulong hashB;
71 [FieldOffset(16)]
72 public ulong hashC;
71 73
72 public override string ToString() 74 public override string ToString()
73 { 75 {
74 return uuid.ToString(); 76 return uuid.ToString() + "-" + hashC.ToString() ;
75 } 77 }
76 } 78 }
77 79