aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
index 952ecc8..2fe34e3 100644
--- a/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
@@ -936,13 +936,14 @@ namespace OpenSim.Region.Physics.Meshing
936 Byte[] someBytes; 936 Byte[] someBytes;
937 937
938 key.hashB = 5181; 938 key.hashB = 5181;
939 key.hashC = 5181;
939 ulong hash = 5381; 940 ulong hash = 5381;
940 941
941 if (primShape.SculptEntry) 942 if (primShape.SculptEntry)
942 { 943 {
943 key.uuid = primShape.SculptTexture; 944 key.uuid = primShape.SculptTexture;
944 key.hashB = mdjb2(key.hashB, primShape.SculptType); 945 key.hashC = mdjb2(key.hashC, primShape.SculptType);
945 key.hashB = mdjb2(key.hashB, primShape.PCode); 946 key.hashC = mdjb2(key.hashC, primShape.PCode);
946 } 947 }
947 else 948 else
948 { 949 {
@@ -954,6 +955,9 @@ namespace OpenSim.Region.Physics.Meshing
954 hash = mdjb2(hash, primShape.PathScaleX); 955 hash = mdjb2(hash, primShape.PathScaleX);
955 hash = mdjb2(hash, primShape.PathScaleY); 956 hash = mdjb2(hash, primShape.PathScaleY);
956 hash = mdjb2(hash, primShape.PathShearX); 957 hash = mdjb2(hash, primShape.PathShearX);
958 key.hashA = hash;
959 key.hashA |= 0xf000000000000000;
960 hash = key.hashB;
957 hash = mdjb2(hash, primShape.PathShearY); 961 hash = mdjb2(hash, primShape.PathShearY);
958 hash = mdjb2(hash, (byte)primShape.PathTwist); 962 hash = mdjb2(hash, (byte)primShape.PathTwist);
959 hash = mdjb2(hash, (byte)primShape.PathTwistBegin); 963 hash = mdjb2(hash, (byte)primShape.PathTwistBegin);
@@ -966,10 +970,10 @@ namespace OpenSim.Region.Physics.Meshing
966 hash = mdjb2(hash, primShape.ProfileEnd); 970 hash = mdjb2(hash, primShape.ProfileEnd);
967 hash = mdjb2(hash, primShape.ProfileHollow); 971 hash = mdjb2(hash, primShape.ProfileHollow);
968 hash = mdjb2(hash, primShape.PCode); 972 hash = mdjb2(hash, primShape.PCode);
969 key.hashA = hash; 973 key.hashB = hash;
970 } 974 }
971 975
972 hash = key.hashB; 976 hash = key.hashC;
973 977
974 someBytes = size.GetBytes(); 978 someBytes = size.GetBytes();
975 for (int i = 0; i < someBytes.Length; i++) 979 for (int i = 0; i < someBytes.Length; i++)