diff options
| author | Justin Clark-Casey (justincc) | 2013-09-16 23:00:40 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-09-16 23:00:40 +0100 |
| commit | f99dae03cb1f5ab7215de1f7741befc3f0856840 (patch) | |
| tree | 93408de16e0ada65d1a134a9d29eeb3a9144cf7f /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
| parent | Make llGetLinkPrimitiveParams() abort and return existing list of params when... (diff) | |
| download | opensim-SC_OLD-f99dae03cb1f5ab7215de1f7741befc3f0856840.zip opensim-SC_OLD-f99dae03cb1f5ab7215de1f7741befc3f0856840.tar.gz opensim-SC_OLD-f99dae03cb1f5ab7215de1f7741befc3f0856840.tar.bz2 opensim-SC_OLD-f99dae03cb1f5ab7215de1f7741befc3f0856840.tar.xz | |
Fix bug where using PRIM_LINK_TARGET with only two remaining list items (e.g. link number then PRIM_ROTATION) would not return the parameter
Extended regression test for this case
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index bd451a5..975bf2d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -8202,7 +8202,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8202 | else | 8202 | else |
| 8203 | remaining = GetAgentParams((ScenePresence)entity, rules, ref result); | 8203 | remaining = GetAgentParams((ScenePresence)entity, rules, ref result); |
| 8204 | 8204 | ||
| 8205 | if (remaining == null || remaining.Length <= 2) | 8205 | if (remaining == null || remaining.Length < 2) |
| 8206 | return result; | 8206 | return result; |
| 8207 | 8207 | ||
| 8208 | int linknumber = remaining.GetLSLIntegerItem(0); | 8208 | int linknumber = remaining.GetLSLIntegerItem(0); |
| @@ -8786,7 +8786,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8786 | case (int)ScriptBaseClass.PRIM_LINK_TARGET: | 8786 | case (int)ScriptBaseClass.PRIM_LINK_TARGET: |
| 8787 | 8787 | ||
| 8788 | // TODO: Should be issuing a runtime script warning in this case. | 8788 | // TODO: Should be issuing a runtime script warning in this case. |
| 8789 | if (remain < 3) | 8789 | if (remain < 2) |
| 8790 | return null; | 8790 | return null; |
| 8791 | 8791 | ||
| 8792 | return rules.GetSublist(idx, -1); | 8792 | return rules.GetSublist(idx, -1); |