diff options
author | UbitUmarov | 2012-08-16 22:14:56 +0100 |
---|---|---|
committer | UbitUmarov | 2012-08-16 22:14:56 +0100 |
commit | f9a318380be0ddcce3c8bbc09c13bfb0206674f1 (patch) | |
tree | 65d0e21c368012f9ed6d599167a4afa92f50f1a5 /OpenSim/Region | |
parent | fix vs2010 build (diff) | |
download | opensim-SC-f9a318380be0ddcce3c8bbc09c13bfb0206674f1.zip opensim-SC-f9a318380be0ddcce3c8bbc09c13bfb0206674f1.tar.gz opensim-SC-f9a318380be0ddcce3c8bbc09c13bfb0206674f1.tar.bz2 opensim-SC-f9a318380be0ddcce3c8bbc09c13bfb0206674f1.tar.xz |
let setLinkPrimParams terminate even if there are no more parts.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 |
1 files changed, 3 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 d6aafaf..1433cc9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7778,10 +7778,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7778 | remaining = SetPrimParams((ScenePresence)part, rules); | 7778 | remaining = SetPrimParams((ScenePresence)part, rules); |
7779 | } | 7779 | } |
7780 | 7780 | ||
7781 | while((object)remaining != null && remaining.Length > 2) | 7781 | while ((object)remaining != null && remaining.Length > 2) |
7782 | { | 7782 | { |
7783 | linknumber = remaining.GetLSLIntegerItem(0); | 7783 | linknumber = remaining.GetLSLIntegerItem(0); |
7784 | rules = remaining.GetSublist(1,-1); | 7784 | rules = remaining.GetSublist(1, -1); |
7785 | parts.Clear(); | 7785 | parts.Clear(); |
7786 | prims = GetLinkParts(linknumber); | 7786 | prims = GetLinkParts(linknumber); |
7787 | avatars = GetLinkAvatars(linknumber); | 7787 | avatars = GetLinkAvatars(linknumber); |
@@ -7790,6 +7790,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7790 | foreach (ScenePresence p in avatars) | 7790 | foreach (ScenePresence p in avatars) |
7791 | parts.Add(p); | 7791 | parts.Add(p); |
7792 | 7792 | ||
7793 | remaining = null; | ||
7793 | foreach (object part in parts) | 7794 | foreach (object part in parts) |
7794 | { | 7795 | { |
7795 | if (part is SceneObjectPart) | 7796 | if (part is SceneObjectPart) |