diff options
| author | Justin Clark-Casey (justincc) | 2011-07-09 00:42:48 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-07-09 00:42:48 +0100 |
| commit | d79c6c8820e7219afa3f01a0910a794bcdbb307d (patch) | |
| tree | aa8e5f42e6f96a22c58b72c725a7ed31dc628554 | |
| parent | minor: code tidy and inserted log lines for future use. (diff) | |
| download | opensim-SC_OLD-d79c6c8820e7219afa3f01a0910a794bcdbb307d.zip opensim-SC_OLD-d79c6c8820e7219afa3f01a0910a794bcdbb307d.tar.gz opensim-SC_OLD-d79c6c8820e7219afa3f01a0910a794bcdbb307d.tar.bz2 opensim-SC_OLD-d79c6c8820e7219afa3f01a0910a794bcdbb307d.tar.xz | |
Rename SetSculptData() to SetSculptProperties(), since this is what it does (setting SculptData is done through the property)
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 8489ad8..d873071 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
| @@ -378,7 +378,7 @@ namespace OpenSim.Framework | |||
| 378 | _pathEnd = Primitive.PackEndCut(end); | 378 | _pathEnd = Primitive.PackEndCut(end); |
| 379 | } | 379 | } |
| 380 | 380 | ||
| 381 | public void SetSculptData(byte sculptType, UUID SculptTextureUUID) | 381 | public void SetSculptProperties(byte sculptType, UUID SculptTextureUUID) |
| 382 | { | 382 | { |
| 383 | _sculptType = sculptType; | 383 | _sculptType = sculptType; |
| 384 | _sculptTexture = SculptTextureUUID; | 384 | _sculptTexture = SculptTextureUUID; |
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 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ce7d97c..22f8ddb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6900,7 +6900,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6900 | // retain pathcurve | 6900 | // retain pathcurve |
| 6901 | shapeBlock.PathCurve = part.Shape.PathCurve; | 6901 | shapeBlock.PathCurve = part.Shape.PathCurve; |
| 6902 | 6902 | ||
| 6903 | part.Shape.SetSculptData((byte)type, sculptId); | 6903 | part.Shape.SetSculptProperties((byte)type, sculptId); |
| 6904 | part.Shape.SculptEntry = true; | 6904 | part.Shape.SculptEntry = true; |
| 6905 | part.UpdateShape(shapeBlock); | 6905 | part.UpdateShape(shapeBlock); |
| 6906 | } | 6906 | } |