Merge branch 'master' into httptests

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
                 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 
+            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;