aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorMelanie2012-08-24 23:53:14 +0200
committerMelanie2012-08-24 23:53:14 +0200
commitf1a71f544b02893c064b98368bd640fa2492a170 (patch)
tree2100bd63e85a37948dfc74a07f1d70a82a665048 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentRemove debug spam (diff)
parent let setLinkPrimParams terminate even if there are no more parts. (diff)
downloadopensim-SC-f1a71f544b02893c064b98368bd640fa2492a170.zip
opensim-SC-f1a71f544b02893c064b98368bd640fa2492a170.tar.gz
opensim-SC-f1a71f544b02893c064b98368bd640fa2492a170.tar.bz2
opensim-SC-f1a71f544b02893c064b98368bd640fa2492a170.tar.xz
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
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 3e1b43e..d8ef772 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7785,10 +7785,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7785 remaining = SetPrimParams((ScenePresence)part, rules); 7785 remaining = SetPrimParams((ScenePresence)part, rules);
7786 } 7786 }
7787 7787
7788 while((object)remaining != null && remaining.Length > 2) 7788 while ((object)remaining != null && remaining.Length > 2)
7789 { 7789 {
7790 linknumber = remaining.GetLSLIntegerItem(0); 7790 linknumber = remaining.GetLSLIntegerItem(0);
7791 rules = remaining.GetSublist(1,-1); 7791 rules = remaining.GetSublist(1, -1);
7792 parts.Clear(); 7792 parts.Clear();
7793 prims = GetLinkParts(linknumber); 7793 prims = GetLinkParts(linknumber);
7794 avatars = GetLinkAvatars(linknumber); 7794 avatars = GetLinkAvatars(linknumber);
@@ -7797,6 +7797,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7797 foreach (ScenePresence p in avatars) 7797 foreach (ScenePresence p in avatars)
7798 parts.Add(p); 7798 parts.Add(p);
7799 7799
7800 remaining = null;
7800 foreach (object part in parts) 7801 foreach (object part in parts)
7801 { 7802 {
7802 if (part is SceneObjectPart) 7803 if (part is SceneObjectPart)