aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMandarinka Tasty2016-05-28 04:49:21 +0200
committerDiva Canto2016-06-12 13:58:20 -0700
commit634d85a30d2b859b1623a12767fbc0fa3ca32ceb (patch)
tree4c5cf5842cd6c1e85780594ff691e34aff4da756 /OpenSim/Region
parentMantis #7858: DeleteSceneObject done slightly differently. ProcessEntities no... (diff)
downloadopensim-SC-634d85a30d2b859b1623a12767fbc0fa3ca32ceb.zip
opensim-SC-634d85a30d2b859b1623a12767fbc0fa3ca32ceb.tar.gz
opensim-SC-634d85a30d2b859b1623a12767fbc0fa3ca32ceb.tar.bz2
opensim-SC-634d85a30d2b859b1623a12767fbc0fa3ca32ceb.tar.xz
Detection of Cylinder and Prism for flexi prims
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: Diva Canto <diva@metaverseink.com>
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b4feb9a..445a6db 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3795,7 +3795,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
3795 } 3795 }
3796 else if ((Shape.ProfileCurve & 0x07) == (byte)ProfileShape.Circle) 3796 else if ((Shape.ProfileCurve & 0x07) == (byte)ProfileShape.Circle)
3797 { 3797 {
3798 if (Shape.PathCurve == (byte)Extrusion.Straight) 3798 if (Shape.PathCurve == (byte)Extrusion.Straight || Shape.PathCurve == (byte)Extrusion.Flexible)
3799 return PrimType.CYLINDER; 3799 return PrimType.CYLINDER;
3800 // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits 3800 // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits
3801 else if (Shape.PathCurve == (byte)Extrusion.Curve1) 3801 else if (Shape.PathCurve == (byte)Extrusion.Curve1)
@@ -3808,7 +3808,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
3808 } 3808 }
3809 else if ((Shape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle) 3809 else if ((Shape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle)
3810 { 3810 {
3811 if (Shape.PathCurve == (byte)Extrusion.Straight) 3811 if (Shape.PathCurve == (byte)Extrusion.Straight || Shape.PathCurve == (byte)Extrusion.Flexible)
3812 return PrimType.PRISM; 3812 return PrimType.PRISM;
3813 else if (Shape.PathCurve == (byte)Extrusion.Curve1) 3813 else if (Shape.PathCurve == (byte)Extrusion.Curve1)
3814 return PrimType.RING; 3814 return PrimType.RING;