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

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2017-09-16 01:00:28 +01:00
parent b581a64788 997a85568e
commit 5687c5d494
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -5856,7 +5856,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
update.State = part.Shape.State; // not sure about this
}
update.ObjectData = objectData;
update.ParentID = part.ParentID;
update.PathBegin = part.Shape.PathBegin;
@@ -5877,13 +5876,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
update.ProfileBegin = part.Shape.ProfileBegin;
update.ProfileCurve = part.Shape.ProfileCurve;
if(part.Shape.SculptType == (byte)SculptType.Mesh) // filter out hack
update.ProfileCurve = (byte)(part.Shape.ProfileCurve & 0x0f);
else
update.ProfileCurve = part.Shape.ProfileCurve;
ushort profileBegin = part.Shape.ProfileBegin;
ushort profileHollow = part.Shape.ProfileHollow;
if(part.Shape.SculptType == (byte)SculptType.Mesh) // filter out hack
{
update.ProfileCurve = (byte)(part.Shape.ProfileCurve & 0x0f);
// fix old values that confused viewers
if(profileBegin == 1)
profileBegin = 12500;
if(profileHollow == 1)
profileHollow = 27500;
}
else
{
update.ProfileCurve = part.Shape.ProfileCurve;
}
update.ProfileHollow = profileHollow;
update.ProfileBegin = profileBegin;
update.ProfileEnd = part.Shape.ProfileEnd;
update.ProfileHollow = part.Shape.ProfileHollow;
update.PSBlock = part.ParticleSystem ?? Utils.EmptyBytes;
update.TextColor = part.GetTextColor().GetBytes(false);
update.TextureAnim = part.TextureAnimation ?? Utils.EmptyBytes;