diff options
author | Charles Krinke | 2008-07-06 03:47:21 +0000 |
---|---|---|
committer | Charles Krinke | 2008-07-06 03:47:21 +0000 |
commit | f6375fceb43c23444979b7bb3df3f1d2cba61796 (patch) | |
tree | b53936d91c8e79fa0455d8995acdd13accd6e122 | |
parent | * Moves sending items to inventory via a delete into a seperate thread (this ... (diff) | |
download | opensim-SC_OLD-f6375fceb43c23444979b7bb3df3f1d2cba61796.zip opensim-SC_OLD-f6375fceb43c23444979b7bb3df3f1d2cba61796.tar.gz opensim-SC_OLD-f6375fceb43c23444979b7bb3df3f1d2cba61796.tar.bz2 opensim-SC_OLD-f6375fceb43c23444979b7bb3df3f1d2cba61796.tar.xz |
Mantis#1674. Thank you kindly, Matth for a patch that:
This patch fixes an error in llSetPrimitiveParams() that
prevents correctly setting the type of the prim to SCULPT_TYPE.
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 2d858dc..8da164c 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -5086,6 +5086,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5086 | shapeBlock.PathCurve = m_host.Shape.PathCurve; | 5086 | shapeBlock.PathCurve = m_host.Shape.PathCurve; |
5087 | 5087 | ||
5088 | m_host.Shape.SetSculptData((byte)type, sculptId); | 5088 | m_host.Shape.SetSculptData((byte)type, sculptId); |
5089 | m_host.Shape.SculptEntry = true; | ||
5089 | m_host.UpdateShape(shapeBlock); | 5090 | m_host.UpdateShape(shapeBlock); |
5090 | } | 5091 | } |
5091 | 5092 | ||
@@ -5187,7 +5188,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
5187 | taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); | 5188 | taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); |
5188 | topshear = new LSL_Types.Vector3(rules.Data[idx++].ToString()); | 5189 | topshear = new LSL_Types.Vector3(rules.Data[idx++].ToString()); |
5189 | m_host.Shape.PathCurve = (byte) Extrusion.Straight; | 5190 | m_host.Shape.PathCurve = (byte) Extrusion.Straight; |
5190 | SetPrimitiveShapeParams(face, v, hollow, twist, taper_b, topshear, 1);; | 5191 | SetPrimitiveShapeParams(face, v, hollow, twist, taper_b, topshear, 1); |
5191 | break; | 5192 | break; |
5192 | 5193 | ||
5193 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER: | 5194 | case (int)BuiltIn_Commands_BaseClass.PRIM_TYPE_CYLINDER: |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 06f9f3b..0e85340 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4896,6 +4896,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4896 | shapeBlock.PathCurve = m_host.Shape.PathCurve; | 4896 | shapeBlock.PathCurve = m_host.Shape.PathCurve; |
4897 | 4897 | ||
4898 | m_host.Shape.SetSculptData((byte)type, sculptId); | 4898 | m_host.Shape.SetSculptData((byte)type, sculptId); |
4899 | m_host.Shape.SculptEntry = true; | ||
4899 | m_host.UpdateShape(shapeBlock); | 4900 | m_host.UpdateShape(shapeBlock); |
4900 | } | 4901 | } |
4901 | 4902 | ||
@@ -4997,7 +4998,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4997 | taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); | 4998 | taper_b = new LSL_Types.Vector3(rules.Data[idx++].ToString()); |
4998 | topshear = new LSL_Types.Vector3(rules.Data[idx++].ToString()); | 4999 | topshear = new LSL_Types.Vector3(rules.Data[idx++].ToString()); |
4999 | m_host.Shape.PathCurve = (byte) Extrusion.Straight; | 5000 | m_host.Shape.PathCurve = (byte) Extrusion.Straight; |
5000 | SetPrimitiveShapeParams(face, v, hollow, twist, taper_b, topshear, 1);; | 5001 | SetPrimitiveShapeParams(face, v, hollow, twist, taper_b, topshear, 1); |
5001 | break; | 5002 | break; |
5002 | 5003 | ||
5003 | case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER: | 5004 | case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER: |