OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2017-10-30 19:06:17 +00:00
parent 16a8e166ff 5360a8fea4
commit 39d1426f27
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -343,12 +343,14 @@ namespace OpenSim.Framework
case 1: // torus case 1: // torus
shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle; shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
shape.PathCurve = (byte)Extrusion.Curve1; shape.PathCurve = (byte)Extrusion.Curve1;
shape._pathScaleY = 150;
break; break;
case 2: // torus with hollow (a sl viewer whould see 4 faces on a hollow sphere) 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.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
shape.PathCurve = (byte)Extrusion.Curve1; shape.PathCurve = (byte)Extrusion.Curve1;
shape.ProfileHollow = 27500; shape.ProfileHollow = 27500;
shape._pathScaleY = 150;
break; break;
case 3: // cylinder case 3: // cylinder

3
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5887,6 +5887,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
profileBegin = 9375; profileBegin = 9375;
if(profileHollow == 1) if(profileHollow == 1)
profileHollow = 27500; 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 else
{ {