diff options
| author | UbitUmarov | 2017-09-16 19:01:22 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-09-16 19:01:22 +0100 |
| commit | 765f4eef1e5db179ca8cb65701f471bddc5a00dc (patch) | |
| tree | 191c09e9502b6ad4b284da62a51c8e29bc8db97b /OpenSim/Framework | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | bug fix: Of course i had to pick a wrong number for profileBegin (diff) | |
| download | opensim-SC-765f4eef1e5db179ca8cb65701f471bddc5a00dc.zip opensim-SC-765f4eef1e5db179ca8cb65701f471bddc5a00dc.tar.gz opensim-SC-765f4eef1e5db179ca8cb65701f471bddc5a00dc.tar.bz2 opensim-SC-765f4eef1e5db179ca8cb65701f471bddc5a00dc.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 98d1bdd..6607d9f 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -381,7 +381,7 @@ namespace OpenSim.Framework | |||
| 381 | default: // 8 faces box with cut | 381 | default: // 8 faces box with cut |
| 382 | shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle; | 382 | shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle; |
| 383 | shape.PathCurve = (byte)Extrusion.Straight; | 383 | shape.PathCurve = (byte)Extrusion.Straight; |
| 384 | shape.ProfileBegin = 12500; | 384 | shape.ProfileBegin = 9375; |
| 385 | break; | 385 | break; |
| 386 | } | 386 | } |
| 387 | 387 | ||