Merge branch 'master' into careminster-presence-refactor

author: root 2011-07-09 01:06:46 +0100
committer: root 2011-07-09 01:06:46 +0100
commit: c920ff9d1d5840fb6b36efd46e8bec431cc5d15f (patch)
tree: 4b804cf4255f4a8eaa2789cce97154a418f6e0b5 /OpenSim/Region/OptionalModules
parent: Remove another core SNAFU. AbsolutePosition is NOT equal to group position (diff)
parent: Instance-types-in-list fix for LSL/OSSL functions. This will fix llListFindLi... (diff)
download: opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.zip
opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.gz
opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.bz2
opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index faed522..aa23fee 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -801,7 +801,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
            // retain pathcurve
            shapeBlock.PathCurve = part.Shape.PathCurve;
-            part.Shape.SetSculptData((byte)type, sculptId);
+            part.Shape.SetSculptProperties((byte)type, sculptId);
            part.Shape.SculptEntry = true;
            part.UpdateShape(shapeBlock);
        }
author	root	2011-07-09 01:06:46 +0100
committer	root	2011-07-09 01:06:46 +0100
commit	c920ff9d1d5840fb6b36efd46e8bec431cc5d15f (patch)
tree	4b804cf4255f4a8eaa2789cce97154a418f6e0b5 /OpenSim/Region/OptionalModules
parent	Remove another core SNAFU. AbsolutePosition is NOT equal to group position (diff)
parent	Instance-types-in-list fix for LSL/OSSL functions. This will fix llListFindLi... (diff)
download	opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.zip opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.gz opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.bz2 opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index faed522..aa23fee 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -801,7 +801,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
801	// retain pathcurve	801	// retain pathcurve
802	shapeBlock.PathCurve = part.Shape.PathCurve;	802	shapeBlock.PathCurve = part.Shape.PathCurve;
803		803
804	part.Shape.SetSculptData((byte)type, sculptId);	804	part.Shape.SetSculptProperties((byte)type, sculptId);
805	part.Shape.SculptEntry = true;	805	part.Shape.SculptEntry = true;
806	part.UpdateShape(shapeBlock);	806	part.UpdateShape(shapeBlock);
807	}	807	}