aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-12-25 23:10:44 +0000
committerMelanie2009-12-25 23:10:44 +0000
commitd5618fbcc3fbdde22cb3852649563fe61c261ea8 (patch)
treeab50ec9529821081924c384ffc38c667597a2ec6
parentEnable the profile module to be replaced completely, even for the base (diff)
parentClear Shape.SculptEntry if prim type is not a sculptie in llSetPrimitiveParam... (diff)
downloadopensim-SC-d5618fbcc3fbdde22cb3852649563fe61c261ea8.zip
opensim-SC-d5618fbcc3fbdde22cb3852649563fe61c261ea8.tar.gz
opensim-SC-d5618fbcc3fbdde22cb3852649563fe61c261ea8.tar.bz2
opensim-SC-d5618fbcc3fbdde22cb3852649563fe61c261ea8.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-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 cf3a1a0..2b6d9bd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6502,6 +6502,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6502 // retain pathcurve 6502 // retain pathcurve
6503 shapeBlock.PathCurve = part.Shape.PathCurve; 6503 shapeBlock.PathCurve = part.Shape.PathCurve;
6504 6504
6505 part.Shape.SculptEntry = false;
6505 return shapeBlock; 6506 return shapeBlock;
6506 } 6507 }
6507 6508
@@ -6550,6 +6551,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6550 shapeBlock.PathShearX = (byte)(100 * topshear.x); 6551 shapeBlock.PathShearX = (byte)(100 * topshear.x);
6551 shapeBlock.PathShearY = (byte)(100 * topshear.y); 6552 shapeBlock.PathShearY = (byte)(100 * topshear.y);
6552 6553
6554 part.Shape.SculptEntry = false;
6553 part.UpdateShape(shapeBlock); 6555 part.UpdateShape(shapeBlock);
6554 } 6556 }
6555 6557
@@ -6591,6 +6593,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6591 shapeBlock.ProfileBegin = (ushort)(50000 * dimple.x); 6593 shapeBlock.ProfileBegin = (ushort)(50000 * dimple.x);
6592 shapeBlock.ProfileEnd = (ushort)(50000 * (1 - dimple.y)); 6594 shapeBlock.ProfileEnd = (ushort)(50000 * (1 - dimple.y));
6593 6595
6596 part.Shape.SculptEntry = false;
6594 part.UpdateShape(shapeBlock); 6597 part.UpdateShape(shapeBlock);
6595 } 6598 }
6596 6599
@@ -6711,6 +6714,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6711 } 6714 }
6712 shapeBlock.PathSkew = (sbyte)(100 * skew); 6715 shapeBlock.PathSkew = (sbyte)(100 * skew);
6713 6716
6717 part.Shape.SculptEntry = false;
6714 part.UpdateShape(shapeBlock); 6718 part.UpdateShape(shapeBlock);
6715 } 6719 }
6716 6720