llGetPrimitiveParams fix prim hollow/hole shape value

author: Micheil Merlin 2011-08-12 21:09:01 -0500
committer: Justin Clark-Casey (justincc) 2011-08-13 15:34:08 +0100
commit: b80dfb6572438cb583e95884c0f607342f0c88d4 (patch)
tree: 2d54624869cbbd630c7c622b8b2f91510b44fc57 /OpenSim/Region/ScriptEngine/Shared/Api
parent: Fix a problem in the Flotsam asset cache where assets were being put into the... (diff)
download: opensim-SC_OLD-b80dfb6572438cb583e95884c0f607342f0c88d4.zip
opensim-SC_OLD-b80dfb6572438cb583e95884c0f607342f0c88d4.tar.gz
opensim-SC_OLD-b80dfb6572438cb583e95884c0f607342f0c88d4.tar.bz2
opensim-SC_OLD-b80dfb6572438cb583e95884c0f607342f0c88d4.tar.xz
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8a281d4..c84afee 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7650,7 +7650,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            case ScriptBaseClass.PRIM_TYPE_BOX:
                            case ScriptBaseClass.PRIM_TYPE_CYLINDER:
                            case ScriptBaseClass.PRIM_TYPE_PRISM:
-                                res.Add(new LSL_Integer(Shape.ProfileCurve));
+                                res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0);    // Isolate hole shape nibble.
                                res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0));
                                res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
                                res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));
@@ -7659,7 +7659,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                break;
                            case ScriptBaseClass.PRIM_TYPE_SPHERE:
-                                res.Add(new LSL_Integer(Shape.ProfileCurve));
+                                res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0);    // Isolate hole shape nibble.
                                res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));
                                res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
                                res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));
@@ -7675,7 +7675,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            case ScriptBaseClass.PRIM_TYPE_TUBE:
                            case ScriptBaseClass.PRIM_TYPE_TORUS:
                                // holeshape
-                                res.Add(new LSL_Integer(Shape.ProfileCurve));
+                                res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0);    // Isolate hole shape nibble.
                                // cut
                                res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));
author	Micheil Merlin	2011-08-12 21:09:01 -0500
committer	Justin Clark-Casey (justincc)	2011-08-13 15:34:08 +0100
commit	b80dfb6572438cb583e95884c0f607342f0c88d4 (patch)
tree	2d54624869cbbd630c7c622b8b2f91510b44fc57 /OpenSim/Region/ScriptEngine/Shared/Api
parent	Fix a problem in the Flotsam asset cache where assets were being put into the... (diff)
download	opensim-SC_OLD-b80dfb6572438cb583e95884c0f607342f0c88d4.zip opensim-SC_OLD-b80dfb6572438cb583e95884c0f607342f0c88d4.tar.gz opensim-SC_OLD-b80dfb6572438cb583e95884c0f607342f0c88d4.tar.bz2 opensim-SC_OLD-b80dfb6572438cb583e95884c0f607342f0c88d4.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8a281d4..c84afee 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7650,7 +7650,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7650	case ScriptBaseClass.PRIM_TYPE_BOX:	7650	case ScriptBaseClass.PRIM_TYPE_BOX:
7651	case ScriptBaseClass.PRIM_TYPE_CYLINDER:	7651	case ScriptBaseClass.PRIM_TYPE_CYLINDER:
7652	case ScriptBaseClass.PRIM_TYPE_PRISM:	7652	case ScriptBaseClass.PRIM_TYPE_PRISM:
7653	res.Add(new LSL_Integer(Shape.ProfileCurve));	7653	res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0); // Isolate hole shape nibble.
7654	res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0));	7654	res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0));
7655	res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));	7655	res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
7656	res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));	7656	res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));
@@ -7659,7 +7659,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7659	break;	7659	break;
7660		7660
7661	case ScriptBaseClass.PRIM_TYPE_SPHERE:	7661	case ScriptBaseClass.PRIM_TYPE_SPHERE:
7662	res.Add(new LSL_Integer(Shape.ProfileCurve));	7662	res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0); // Isolate hole shape nibble.
7663	res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));	7663	res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));
7664	res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));	7664	res.Add(new LSL_Float(Shape.ProfileHollow / 50000.0));
7665	res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));	7665	res.Add(new LSL_Vector(Shape.PathTwistBegin / 100.0, Shape.PathTwist / 100.0, 0));
@@ -7675,7 +7675,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7675	case ScriptBaseClass.PRIM_TYPE_TUBE:	7675	case ScriptBaseClass.PRIM_TYPE_TUBE:
7676	case ScriptBaseClass.PRIM_TYPE_TORUS:	7676	case ScriptBaseClass.PRIM_TYPE_TORUS:
7677	// holeshape	7677	// holeshape
7678	res.Add(new LSL_Integer(Shape.ProfileCurve));	7678	res.Add(new LSL_Integer(Shape.ProfileCurve) & 0xf0); // Isolate hole shape nibble.
7679		7679
7680	// cut	7680	// cut
7681	res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));	7681	res.Add(new LSL_Vector(Shape.PathBegin / 50000.0, 1 - Shape.PathEnd / 50000.0, 0));