diff options
author | Melanie | 2010-10-24 18:19:48 +0200 |
---|---|---|
committer | Melanie | 2010-10-24 18:17:21 +0100 |
commit | 852c61aaa6e5a2e41e7c1724ee974382a55007ec (patch) | |
tree | 84ac67de50fc1e7487cb3531b74070c665826924 /OpenSim | |
parent | Added inner exception handling in Shape deserialization processing, so that t... (diff) | |
download | opensim-SC-852c61aaa6e5a2e41e7c1724ee974382a55007ec.zip opensim-SC-852c61aaa6e5a2e41e7c1724ee974382a55007ec.tar.gz opensim-SC-852c61aaa6e5a2e41e7c1724ee974382a55007ec.tar.bz2 opensim-SC-852c61aaa6e5a2e41e7c1724ee974382a55007ec.tar.xz |
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 27 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 3 |
2 files changed, 30 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 59a3618..1a13dea 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7268,6 +7268,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7268 | part.SetText(primText, av3, Util.Clip((float)primTextAlpha, 0.0f, 1.0f)); | 7268 | part.SetText(primText, av3, Util.Clip((float)primTextAlpha, 0.0f, 1.0f)); |
7269 | 7269 | ||
7270 | break; | 7270 | break; |
7271 | case (int)ScriptBaseClass.PRIM_NAME: | ||
7272 | if (remain < 1) | ||
7273 | return; | ||
7274 | string primName = rules.GetLSLStringItem(idx++); | ||
7275 | part.Name = primName; | ||
7276 | break; | ||
7277 | case (int)ScriptBaseClass.PRIM_DESC: | ||
7278 | if (remain < 1) | ||
7279 | return; | ||
7280 | string primDesc = rules.GetLSLStringItem(idx++); | ||
7281 | part.Description = primDesc; | ||
7282 | break; | ||
7283 | case (int)ScriptBaseClass.PRIM_ROT_LOCAL: | ||
7284 | if (remain < 1) | ||
7285 | return; | ||
7286 | LSL_Rotation lr = rules.GetQuaternionItem(idx++); | ||
7287 | SetRot(part, Rot2Quaternion(lr)); | ||
7288 | break; | ||
7271 | } | 7289 | } |
7272 | } | 7290 | } |
7273 | } | 7291 | } |
@@ -7813,6 +7831,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7813 | textColor.B)); | 7831 | textColor.B)); |
7814 | res.Add(new LSL_Float(textColor.A)); | 7832 | res.Add(new LSL_Float(textColor.A)); |
7815 | break; | 7833 | break; |
7834 | case (int)ScriptBaseClass.PRIM_NAME: | ||
7835 | res.Add(part.Name); | ||
7836 | break; | ||
7837 | case (int)ScriptBaseClass.PRIM_DESC: | ||
7838 | res.Add(part.Description); | ||
7839 | break; | ||
7840 | case (int)ScriptBaseClass.PRIM_ROT_LOCAL: | ||
7841 | res.Add(new LSL_Rotation(part.RotationOffset.X, part.RotationOffset.Y, part.RotationOffset.Z, part.RotationOffset.W)); | ||
7842 | break; | ||
7816 | } | 7843 | } |
7817 | } | 7844 | } |
7818 | return res; | 7845 | return res; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 5da6bb9..b96e977 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -316,6 +316,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
316 | public const int PRIM_POINT_LIGHT = 23; // Huh? | 316 | public const int PRIM_POINT_LIGHT = 23; // Huh? |
317 | public const int PRIM_GLOW = 25; | 317 | public const int PRIM_GLOW = 25; |
318 | public const int PRIM_TEXT = 26; | 318 | public const int PRIM_TEXT = 26; |
319 | public const int PRIM_NAME = 27; | ||
320 | public const int PRIM_DESC = 28; | ||
321 | public const int PRIM_ROT_LOCAL = 29; | ||
319 | public const int PRIM_TEXGEN_DEFAULT = 0; | 322 | public const int PRIM_TEXGEN_DEFAULT = 0; |
320 | public const int PRIM_TEXGEN_PLANAR = 1; | 323 | public const int PRIM_TEXGEN_PLANAR = 1; |
321 | 324 | ||