3 files changed, 21 insertions, 9 deletions

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 96d78d3..98d1bdd 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -348,7 +348,7 @@ namespace OpenSim.Framework
                 case 2: // torus with hollow (a sl viewer whould see 4 faces on a hollow sphere)
                     shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
                     shape.PathCurve = (byte)Extrusion.Curve1;
-                    shape.ProfileHollow = 1;
+                    shape.ProfileHollow = 27500;
                     break;
 
                 case 3: // cylinder
@@ -359,7 +359,7 @@ namespace OpenSim.Framework
                 case 4: // cylinder with hollow
                     shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
                     shape.PathCurve = (byte)Extrusion.Straight;
-                    shape.ProfileHollow = 1;
+                    shape.ProfileHollow = 27500;
                     break;
 
                 case 5: // prism
@@ -375,13 +375,13 @@ namespace OpenSim.Framework
                 case 7: // box with hollow
                     shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
                     shape.PathCurve = (byte)Extrusion.Straight;
-                    shape.ProfileHollow = 1;
+                    shape.ProfileHollow = 27500;
                     break;
 
                 default: // 8 faces  box with cut
                     shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
                     shape.PathCurve = (byte)Extrusion.Straight;
-                    shape.ProfileBegin = 1;
+                    shape.ProfileBegin = 12500;
                     break;
             }
 
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 48078ad..20d30b5 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Framework
                 request.Timeout = timeout;
                 request.KeepAlive = false;
                 request.MaximumAutomaticRedirections = 10;
-                request.ReadWriteTimeout = timeout / 4;
+                request.ReadWriteTimeout = timeout / 2;
                 request.Headers[OSHeaderRequestID] = reqnum.ToString();
 
                 // If there is some input, write it into the request
@@ -396,7 +396,7 @@ namespace OpenSim.Framework
                 request.Timeout = timeout;
                 request.KeepAlive = false;
                 request.MaximumAutomaticRedirections = 10;
-                request.ReadWriteTimeout = timeout / 4;
+                request.ReadWriteTimeout = timeout / 2;
                 request.Headers[OSHeaderRequestID] = reqnum.ToString();
 
                 if (data != null)
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;