aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorUbitUmarov2017-09-16 00:19:58 +0100
committerUbitUmarov2017-09-16 00:19:58 +0100
commit05da6b9f1417b8ccef318b8d5e13be695e38f08d (patch)
tree779270f37094804357c7abf996a5b2300facd8a6 /OpenSim/Region/ClientStack/Linden
parentBulletSim: Merge branch 'BulletSim2017' (diff)
downloadopensim-SC_OLD-05da6b9f1417b8ccef318b8d5e13be695e38f08d.zip
opensim-SC_OLD-05da6b9f1417b8ccef318b8d5e13be695e38f08d.tar.gz
opensim-SC_OLD-05da6b9f1417b8ccef318b8d5e13be695e38f08d.tar.bz2
opensim-SC_OLD-05da6b9f1417b8ccef318b8d5e13be695e38f08d.tar.xz
bug fix. Increase the values of profileHollow and profileBegin used to match pbs number of faces and the Mesh number of faces. The small values i used before seem to be randomly lost.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs18
1 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index c44c741..f068cef 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5856,7 +5856,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5856 update.State = part.Shape.State; // not sure about this 5856 update.State = part.Shape.State; // not sure about this
5857 } 5857 }
5858 5858
5859
5860 update.ObjectData = objectData; 5859 update.ObjectData = objectData;
5861 update.ParentID = part.ParentID; 5860 update.ParentID = part.ParentID;
5862 update.PathBegin = part.Shape.PathBegin; 5861 update.PathBegin = part.Shape.PathBegin;
@@ -5877,13 +5876,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5877 update.ProfileBegin = part.Shape.ProfileBegin; 5876 update.ProfileBegin = part.Shape.ProfileBegin;
5878 update.ProfileCurve = part.Shape.ProfileCurve; 5877 update.ProfileCurve = part.Shape.ProfileCurve;
5879 5878
5880 if(part.Shape.SculptType == (byte)SculptType.Mesh) // filter out hack 5879 ushort profileBegin = part.Shape.ProfileBegin;
5880 ushort profileHollow = part.Shape.ProfileHollow;
5881
5882 if(part.Shape.SculptType == (byte)SculptType.Mesh) // filter out hack
5883 {
5881 update.ProfileCurve = (byte)(part.Shape.ProfileCurve & 0x0f); 5884 update.ProfileCurve = (byte)(part.Shape.ProfileCurve & 0x0f);
5885 // fix old values that confused viewers
5886 if(profileBegin == 1)
5887 profileBegin = 12500;
5888 if(profileHollow == 1)
5889 profileHollow = 27500;
5890 }
5882 else 5891 else
5892 {
5883 update.ProfileCurve = part.Shape.ProfileCurve; 5893 update.ProfileCurve = part.Shape.ProfileCurve;
5894 }
5884 5895
5896 update.ProfileHollow = profileHollow;
5897 update.ProfileBegin = profileBegin;
5885 update.ProfileEnd = part.Shape.ProfileEnd; 5898 update.ProfileEnd = part.Shape.ProfileEnd;
5886 update.ProfileHollow = part.Shape.ProfileHollow;
5887 update.PSBlock = part.ParticleSystem ?? Utils.EmptyBytes; 5899 update.PSBlock = part.ParticleSystem ?? Utils.EmptyBytes;
5888 update.TextColor = part.GetTextColor().GetBytes(false); 5900 update.TextColor = part.GetTextColor().GetBytes(false);
5889 update.TextureAnim = part.TextureAnimation ?? Utils.EmptyBytes; 5901 update.TextureAnim = part.TextureAnimation ?? Utils.EmptyBytes;