From 9ada03bcdd8bff22fea162672b5a3dde88d4d0c5 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 13 Oct 2012 00:49:08 +0100 Subject: [PATCH] missing file (again) --- OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs index 952ecc8d6a..2fe34e3474 100644 --- a/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs @@ -936,13 +936,14 @@ namespace OpenSim.Region.Physics.Meshing Byte[] someBytes; key.hashB = 5181; + key.hashC = 5181; ulong hash = 5381; if (primShape.SculptEntry) { key.uuid = primShape.SculptTexture; - key.hashB = mdjb2(key.hashB, primShape.SculptType); - key.hashB = mdjb2(key.hashB, primShape.PCode); + key.hashC = mdjb2(key.hashC, primShape.SculptType); + key.hashC = mdjb2(key.hashC, primShape.PCode); } else { @@ -954,6 +955,9 @@ namespace OpenSim.Region.Physics.Meshing hash = mdjb2(hash, primShape.PathScaleX); hash = mdjb2(hash, primShape.PathScaleY); hash = mdjb2(hash, primShape.PathShearX); + key.hashA = hash; + key.hashA |= 0xf000000000000000; + hash = key.hashB; hash = mdjb2(hash, primShape.PathShearY); hash = mdjb2(hash, (byte)primShape.PathTwist); hash = mdjb2(hash, (byte)primShape.PathTwistBegin); @@ -966,10 +970,10 @@ namespace OpenSim.Region.Physics.Meshing hash = mdjb2(hash, primShape.ProfileEnd); hash = mdjb2(hash, primShape.ProfileHollow); hash = mdjb2(hash, primShape.PCode); - key.hashA = hash; + key.hashB = hash; } - hash = key.hashB; + hash = key.hashC; someBytes = size.GetBytes(); for (int i = 0; i < someBytes.Length; i++)