aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-01-09 16:01:00 +0100
committerMelanie2013-01-09 16:01:00 +0100
commit27b0914681f715d2dd270030ac1bfa5f726bf787 (patch)
treee0d19d725615471f051d476ed2da97977750847e
parentMerge branch 'teravuswork' into avination (diff)
downloadopensim-SC_OLD-27b0914681f715d2dd270030ac1bfa5f726bf787.zip
opensim-SC_OLD-27b0914681f715d2dd270030ac1bfa5f726bf787.tar.gz
opensim-SC_OLD-27b0914681f715d2dd270030ac1bfa5f726bf787.tar.bz2
opensim-SC_OLD-27b0914681f715d2dd270030ac1bfa5f726bf787.tar.xz
Prevent a null ref in llGetLinkPrimiteveParams. Still not a fix for the real
issue.
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7e77b0f..267a175 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8750,7 +8750,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8750 remaining = GetPrimParams(avatar, rules, ref res); 8750 remaining = GetPrimParams(avatar, rules, ref res);
8751 } 8751 }
8752 8752
8753 if (remaining != null && remaining.Length > 0) 8753 if ((object)remaining != null && remaining.Length > 0)
8754 { 8754 {
8755 linknumber = remaining.GetLSLIntegerItem(0); 8755 linknumber = remaining.GetLSLIntegerItem(0);
8756 rules = remaining.GetSublist(1, -1); 8756 rules = remaining.GetSublist(1, -1);