ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

more cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2023-02-24 15:41:13 +00:00
parent 8db5338e06
commit 52359ecfc7
2 changed files with 358 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@@ -982,38 +982,35 @@ namespace OpenSim.Framework
{
ulong hash = 5381;
hash = djb2(hash, this.PathCurve);
hash = djb2(hash, (byte)((byte)this.HollowShape | (byte)this.ProfileShape));
hash = djb2(hash, this.PathBegin);
hash = djb2(hash, this.PathEnd);
hash = djb2(hash, this.PathScaleX);
hash = djb2(hash, this.PathScaleY);
hash = djb2(hash, this.PathShearX);
hash = djb2(hash, this.PathShearY);
hash = djb2(hash, (byte)this.PathTwist);
hash = djb2(hash, (byte)this.PathTwistBegin);
hash = djb2(hash, (byte)this.PathRadiusOffset);
hash = djb2(hash, (byte)this.PathTaperX);
hash = djb2(hash, (byte)this.PathTaperY);
hash = djb2(hash, this.PathRevolutions);
hash = djb2(hash, (byte)this.PathSkew);
hash = djb2(hash, this.ProfileBegin);
hash = djb2(hash, this.ProfileEnd);
hash = djb2(hash, this.ProfileHollow);
hash = djb2(hash, PathCurve);
hash = djb2(hash, (byte)((byte)HollowShape | (byte)ProfileShape));
hash = djb2(hash, PathBegin);
hash = djb2(hash, PathEnd);
hash = djb2(hash, PathScaleX);
hash = djb2(hash, PathScaleY);
hash = djb2(hash, PathShearX);
hash = djb2(hash, PathShearY);
hash = djb2(hash, (byte)PathTwist);
hash = djb2(hash, (byte)PathTwistBegin);
hash = djb2(hash, (byte)PathRadiusOffset);
hash = djb2(hash, (byte)PathTaperX);
hash = djb2(hash, (byte)PathTaperY);
hash = djb2(hash, PathRevolutions);
hash = djb2(hash, (byte)PathSkew);
hash = djb2(hash, ProfileBegin);
hash = djb2(hash, ProfileEnd);
hash = djb2(hash, ProfileHollow);
// TODO: Separate scale out from the primitive shape data (after
// scaling is supported at the physics engine level)
hash = djb2(hash, size.X);
hash = djb2(hash, size.Y);
hash = djb2(hash, size.Z);
// Include LOD in hash, accounting for endianness
hash = djb2(hash, lod);
byte[] lodBytes = new byte[4];
// include sculpt UUID
if (this.SculptEntry)
if (SculptEntry)
{
byte[] scaleBytes = this.SculptTexture.GetBytes();
for (int i = 0; i < scaleBytes.Length; i++)

738
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

File diff suppressed because it is too large Load Diff