diff options
| author | UbitUmarov | 2017-10-30 19:06:17 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-10-30 19:06:17 +0000 |
| commit | 39d1426f27b8e1788d8b98f512eb2a6c9f77c4db (patch) | |
| tree | a66a3169e1172b7c5c6955eb873ff5ac84607a70 /OpenSim/Framework/PrimitiveBaseShape.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | mantis 8258: also limit mesh basic shape torus hole sizeY on (some) existent... (diff) | |
| download | opensim-SC-39d1426f27b8e1788d8b98f512eb2a6c9f77c4db.zip opensim-SC-39d1426f27b8e1788d8b98f512eb2a6c9f77c4db.tar.gz opensim-SC-39d1426f27b8e1788d8b98f512eb2a6c9f77c4db.tar.bz2 opensim-SC-39d1426f27b8e1788d8b98f512eb2a6c9f77c4db.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 |
1 files changed, 2 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 |