aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2012-03-21 01:24:30 +0000
committerUbitUmarov2012-03-21 01:24:30 +0000
commit2e41294da969cd124a013070aaf6ce5dd9f01a5c (patch)
treee7a37cb7c7f45b64058132723f565b94adfec948 /OpenSim/Framework
parentUpdate prebuild (diff)
downloadopensim-SC_OLD-2e41294da969cd124a013070aaf6ce5dd9f01a5c.zip
opensim-SC_OLD-2e41294da969cd124a013070aaf6ce5dd9f01a5c.tar.gz
opensim-SC_OLD-2e41294da969cd124a013070aaf6ce5dd9f01a5c.tar.bz2
opensim-SC_OLD-2e41294da969cd124a013070aaf6ce5dd9f01a5c.tar.xz
add convex state to mesh key, so a change is detected.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 9cfc7ed..c6ccc9e 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -881,6 +881,11 @@ namespace OpenSim.Framework
881 881
882 public ulong GetMeshKey(Vector3 size, float lod) 882 public ulong GetMeshKey(Vector3 size, float lod)
883 { 883 {
884 return GetMeshKey(size, lod, false);
885 }
886
887 public ulong GetMeshKey(Vector3 size, float lod, bool convex)
888 {
884 ulong hash = 5381; 889 ulong hash = 5381;
885 890
886 hash = djb2(hash, this.PathCurve); 891 hash = djb2(hash, this.PathCurve);
@@ -926,6 +931,9 @@ namespace OpenSim.Framework
926 hash = djb2(hash, scaleBytes[i]); 931 hash = djb2(hash, scaleBytes[i]);
927 } 932 }
928 933
934 if(convex)
935 hash = djb2(hash, 0xa5);
936
929 return hash; 937 return hash;
930 } 938 }
931 939