aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs3
2 files changed, 5 insertions, 0 deletions
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
343 case 1: // torus 343 case 1: // torus
344 shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle; 344 shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
345 shape.PathCurve = (byte)Extrusion.Curve1; 345 shape.PathCurve = (byte)Extrusion.Curve1;
346 shape._pathScaleY = 150;
346 break; 347 break;
347 348
348 case 2: // torus with hollow (a sl viewer whould see 4 faces on a hollow sphere) 349 case 2: // torus with hollow (a sl viewer whould see 4 faces on a hollow sphere)
349 shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle; 350 shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
350 shape.PathCurve = (byte)Extrusion.Curve1; 351 shape.PathCurve = (byte)Extrusion.Curve1;
351 shape.ProfileHollow = 27500; 352 shape.ProfileHollow = 27500;
353 shape._pathScaleY = 150;
352 break; 354 break;
353 355
354 case 3: // cylinder 356 case 3: // cylinder
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
5887 profileBegin = 9375; 5887 profileBegin = 9375;
5888 if(profileHollow == 1) 5888 if(profileHollow == 1)
5889 profileHollow = 27500; 5889 profileHollow = 27500;
5890 // fix torus hole size Y that also confuse some viewers
5891 if(update.ProfileCurve == (byte)ProfileShape.Circle && update.PathScaleY < 150)
5892 update.PathScaleY = 150;
5890 } 5893 }
5891 else 5894 else
5892 { 5895 {