Merge branch 'master' into httptests

2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 98d1bdd..6607d9f 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -381,7 +381,7 @@ namespace OpenSim.Framework
                 default: // 8 faces  box with cut
                     shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
                     shape.PathCurve = (byte)Extrusion.Straight;
-                    shape.ProfileBegin = 12500;
+                    shape.ProfileBegin = 9375;
                     break;
             }
 
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f068cef..a404b1b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5884,7 +5884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 update.ProfileCurve = (byte)(part.Shape.ProfileCurve & 0x0f);
                 // fix old values that confused viewers
                 if(profileBegin == 1)
-                    profileBegin = 12500;
+                    profileBegin = 9375;
                 if(profileHollow == 1)
                     profileHollow = 27500;
             }