diff options
| author | PixelTomsen | 2012-02-25 16:39:14 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-25 15:33:33 +0000 |
| commit | 01f454242d20dd513e82eae1eb79db7842e597ea (patch) | |
| tree | 94484442b1add2bcfad8f678f2040c0d40d80496 | |
| parent | Move libopenjpeg native libraries into lib32 and lib64 as appropriate. (diff) | |
| download | opensim-SC-01f454242d20dd513e82eae1eb79db7842e597ea.zip opensim-SC-01f454242d20dd513e82eae1eb79db7842e597ea.tar.gz opensim-SC-01f454242d20dd513e82eae1eb79db7842e597ea.tar.bz2 opensim-SC-01f454242d20dd513e82eae1eb79db7842e597ea.tar.xz | |
PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented
http://opensimulator.org/mantis/view.php?id=5763
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 10 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 525c3c3..c5392b5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -7069,10 +7069,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 7069 | shapeBlock.PathScaleX = 100; | 7069 | shapeBlock.PathScaleX = 100; |
| 7070 | shapeBlock.PathScaleY = 150; | 7070 | shapeBlock.PathScaleY = 150; |
| 7071 | 7071 | ||
| 7072 | if (type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER && | 7072 | int flag = type & (ScriptBaseClass.PRIM_SCULPT_FLAG_INVERT | ScriptBaseClass.PRIM_SCULPT_FLAG_MIRROR); |
| 7073 | type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE && | 7073 | |
| 7074 | type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE && | 7074 | if (type != (ScriptBaseClass.PRIM_SCULPT_TYPE_CYLINDER | flag) && |
| 7075 | type != (int)ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS) | 7075 | type != (ScriptBaseClass.PRIM_SCULPT_TYPE_PLANE | flag) && |
| 7076 | type != (ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE | flag) && | ||
| 7077 | type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag)) | ||
| 7076 | { | 7078 | { |
| 7077 | // default | 7079 | // default |
| 7078 | type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; | 7080 | type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index bb498b5..5a53e15 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -378,6 +378,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 378 | public const int PRIM_SCULPT_TYPE_TORUS = 2; | 378 | public const int PRIM_SCULPT_TYPE_TORUS = 2; |
| 379 | public const int PRIM_SCULPT_TYPE_PLANE = 3; | 379 | public const int PRIM_SCULPT_TYPE_PLANE = 3; |
| 380 | public const int PRIM_SCULPT_TYPE_CYLINDER = 4; | 380 | public const int PRIM_SCULPT_TYPE_CYLINDER = 4; |
| 381 | public const int PRIM_SCULPT_FLAG_INVERT = 64; | ||
| 382 | public const int PRIM_SCULPT_FLAG_MIRROR = 128; | ||
| 381 | 383 | ||
| 382 | public const int MASK_BASE = 0; | 384 | public const int MASK_BASE = 0; |
| 383 | public const int MASK_OWNER = 1; | 385 | public const int MASK_OWNER = 1; |