diff options
| author | Melanie | 2012-08-15 23:58:39 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-16 02:35:03 +0100 |
| commit | 9995421df118e1270f289ea82451e0c7b6dd5b40 (patch) | |
| tree | 6c5dac457a6fe9a12ab5e68a0ab20e6c286dde19 | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-9995421df118e1270f289ea82451e0c7b6dd5b40.zip opensim-SC_OLD-9995421df118e1270f289ea82451e0c7b6dd5b40.tar.gz opensim-SC_OLD-9995421df118e1270f289ea82451e0c7b6dd5b40.tar.bz2 opensim-SC_OLD-9995421df118e1270f289ea82451e0c7b6dd5b40.tar.xz | |
Do a proper null check to avoid the overloaded operator == trap
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
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 55567d1..7e48659 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -10780,7 +10780,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10780 | 10780 | ||
| 10781 | LSL_List remaining = SetPrimParams(obj, rules); | 10781 | LSL_List remaining = SetPrimParams(obj, rules); |
| 10782 | 10782 | ||
| 10783 | while (remaining != null && remaining.Length > 2) | 10783 | while ((object)remaining != null && remaining.Length > 2) |
| 10784 | { | 10784 | { |
| 10785 | LSL_Integer newLink = remaining.GetLSLIntegerItem(0); | 10785 | LSL_Integer newLink = remaining.GetLSLIntegerItem(0); |
| 10786 | LSL_List newrules = remaining.GetSublist(1, -1); | 10786 | LSL_List newrules = remaining.GetSublist(1, -1); |