aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie2009-12-25 23:17:08 +0000
committerMelanie2009-12-25 23:17:08 +0000
commit59a841d69ca22dc3d1acb395bcdeaafd3d4174ed (patch)
tree6ff26e8a58126ad2bcd2a86c920ef6a4fd76ad11 /OpenSim/Region/ScriptEngine/Shared
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-59a841d69ca22dc3d1acb395bcdeaafd3d4174ed.zip
opensim-SC_OLD-59a841d69ca22dc3d1acb395bcdeaafd3d4174ed.tar.gz
opensim-SC_OLD-59a841d69ca22dc3d1acb395bcdeaafd3d4174ed.tar.bz2
opensim-SC_OLD-59a841d69ca22dc3d1acb395bcdeaafd3d4174ed.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index cc903e0..c9d6742 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6606,6 +6606,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6606 // retain pathcurve 6606 // retain pathcurve
6607 shapeBlock.PathCurve = part.Shape.PathCurve; 6607 shapeBlock.PathCurve = part.Shape.PathCurve;
6608 6608
6609 part.Shape.SculptEntry = false;
6609 return shapeBlock; 6610 return shapeBlock;
6610 } 6611 }
6611 6612
@@ -6657,6 +6658,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6657 shapeBlock.PathShearX = (byte)(100 * topshear.x); 6658 shapeBlock.PathShearX = (byte)(100 * topshear.x);
6658 shapeBlock.PathShearY = (byte)(100 * topshear.y); 6659 shapeBlock.PathShearY = (byte)(100 * topshear.y);
6659 6660
6661 part.Shape.SculptEntry = false;
6660 part.UpdateShape(shapeBlock); 6662 part.UpdateShape(shapeBlock);
6661 } 6663 }
6662 6664
@@ -6701,6 +6703,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6701 shapeBlock.ProfileBegin = (ushort)(50000 * dimple.x); 6703 shapeBlock.ProfileBegin = (ushort)(50000 * dimple.x);
6702 shapeBlock.ProfileEnd = (ushort)(50000 * (1 - dimple.y)); 6704 shapeBlock.ProfileEnd = (ushort)(50000 * (1 - dimple.y));
6703 6705
6706 part.Shape.SculptEntry = false;
6704 part.UpdateShape(shapeBlock); 6707 part.UpdateShape(shapeBlock);
6705 } 6708 }
6706 6709
@@ -6824,6 +6827,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6824 } 6827 }
6825 shapeBlock.PathSkew = (sbyte)(100 * skew); 6828 shapeBlock.PathSkew = (sbyte)(100 * skew);
6826 6829
6830 part.Shape.SculptEntry = false;
6827 part.UpdateShape(shapeBlock); 6831 part.UpdateShape(shapeBlock);
6828 } 6832 }
6829 6833