OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-10-13 01:49:49 +02:00
parent fdd6e0361e 9ada03bcdd
commit 4bd64c887d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
View File

@ -936,13 +936,14 @@ namespace OpenSim.Region.Physics.Meshing
Byte[] someBytes; Byte[] someBytes;
key.hashB = 5181; key.hashB = 5181;
key.hashC = 5181;
ulong hash = 5381; ulong hash = 5381;
if (primShape.SculptEntry) if (primShape.SculptEntry)
{ {
key.uuid = primShape.SculptTexture; key.uuid = primShape.SculptTexture;
key.hashB = mdjb2(key.hashB, primShape.SculptType); key.hashC = mdjb2(key.hashC, primShape.SculptType);
key.hashB = mdjb2(key.hashB, primShape.PCode); key.hashC = mdjb2(key.hashC, primShape.PCode);
} }
else else
{ {
@ -954,6 +955,9 @@ namespace OpenSim.Region.Physics.Meshing
hash = mdjb2(hash, primShape.PathScaleX); hash = mdjb2(hash, primShape.PathScaleX);
hash = mdjb2(hash, primShape.PathScaleY); hash = mdjb2(hash, primShape.PathScaleY);
hash = mdjb2(hash, primShape.PathShearX); hash = mdjb2(hash, primShape.PathShearX);
key.hashA = hash;
key.hashA |= 0xf000000000000000;
hash = key.hashB;
hash = mdjb2(hash, primShape.PathShearY); hash = mdjb2(hash, primShape.PathShearY);
hash = mdjb2(hash, (byte)primShape.PathTwist); hash = mdjb2(hash, (byte)primShape.PathTwist);
hash = mdjb2(hash, (byte)primShape.PathTwistBegin); hash = mdjb2(hash, (byte)primShape.PathTwistBegin);
@ -966,10 +970,10 @@ namespace OpenSim.Region.Physics.Meshing
hash = mdjb2(hash, primShape.ProfileEnd); hash = mdjb2(hash, primShape.ProfileEnd);
hash = mdjb2(hash, primShape.ProfileHollow); hash = mdjb2(hash, primShape.ProfileHollow);
hash = mdjb2(hash, primShape.PCode); hash = mdjb2(hash, primShape.PCode);
key.hashA = hash; key.hashB = hash;
} }
hash = key.hashB; hash = key.hashC;
someBytes = size.GetBytes(); someBytes = size.GetBytes();
for (int i = 0; i < someBytes.Length; i++) for (int i = 0; i < someBytes.Length; i++)