diff options
author | Melanie | 2011-11-02 11:43:16 +0000 |
---|---|---|
committer | Melanie | 2011-11-02 11:43:16 +0000 |
commit | b9e700b60d2782b9ccd5790c89920fcc912672ed (patch) | |
tree | df3ff106d3d2bd9eb8d243aa1eeee1902cc09361 /OpenSim/Region/ScriptEngine | |
parent | Removed redundant SceneContents property from Scene. It's the same as SceneGr... (diff) | |
download | opensim-SC-b9e700b60d2782b9ccd5790c89920fcc912672ed.zip opensim-SC-b9e700b60d2782b9ccd5790c89920fcc912672ed.tar.gz opensim-SC-b9e700b60d2782b9ccd5790c89920fcc912672ed.tar.bz2 opensim-SC-b9e700b60d2782b9ccd5790c89920fcc912672ed.tar.xz |
Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 |
1 files changed, 3 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 83c3b78..6c690e8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7411,12 +7411,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7411 | TargetOmega(part, axis, (double)spinrate, (double)gain); | 7411 | TargetOmega(part, axis, (double)spinrate, (double)gain); |
7412 | break; | 7412 | break; |
7413 | case (int)ScriptBaseClass.PRIM_LINK_TARGET: | 7413 | case (int)ScriptBaseClass.PRIM_LINK_TARGET: |
7414 | if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless. | 7414 | if (remain < 1) |
7415 | return; | 7415 | return; |
7416 | LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++); | 7416 | LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++); |
7417 | LSL_List new_rules = rules.GetSublist(idx, -1); | 7417 | part = part.ParentGroup.GetLinkNumPart((int)new_linknumber); |
7418 | setLinkPrimParams((int)new_linknumber, new_rules); | 7418 | break; |
7419 | return; | ||
7420 | } | 7419 | } |
7421 | } | 7420 | } |
7422 | } | 7421 | } |