From 3fb61f4470593d9dbd4e1cc6b421f868816e588e Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 30 Oct 2017 18:26:15 +0000
Subject: mantis 8258: change Mesh basic shape pathScaleY in case of Torus

---
 OpenSim/Framework/PrimitiveBaseShape.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 6607d9f..5056c04 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -343,12 +343,14 @@ namespace OpenSim.Framework
                 case 1: // torus 
                     shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
                     shape.PathCurve = (byte)Extrusion.Curve1;
+                    shape._pathScaleY = 150;
                     break;
 
                 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 = 27500;
+                    shape._pathScaleY = 150;
                     break;
 
                 case 3: // cylinder
-- 
cgit v1.1


From 5360a8fea4249aa19df7d453af0642c6c3a9ac11 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 30 Oct 2017 18:56:05 +0000
Subject: mantis 8258: also limit mesh basic shape torus hole sizeY  on (some)
 existent objects.

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index a404b1b..4a76ffc 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5887,6 +5887,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     profileBegin = 9375;
                 if(profileHollow == 1)
                     profileHollow = 27500;
+                // fix torus hole size Y that also confuse some viewers
+                if(update.ProfileCurve == (byte)ProfileShape.Circle && update.PathScaleY < 150)
+                       update.PathScaleY = 150;                    
             }
             else
             {
-- 
cgit v1.1