Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
author: Melanie 2012-08-16 02:46:48 +0100
committer: Melanie 2012-08-16 02:46:48 +0100
commit: 90ad98370aead53e886832a83a3e8793f361426e (patch)
tree: b7076c5fb7ecf75d1ad31f7756543ade8fbf1b49 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parent: Remove AreUpdatesSuspended flag because it does nothing (diff)
parent: Do a proper null check to avoid the overloaded operator == trap (diff)
download: opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.zip
opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.gz
opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.bz2
opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.xz
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 5f7b95f..d6aafaf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12124,7 +12124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            LSL_List remaining = SetPrimParams(obj, rules);
-            while (remaining != null && remaining.Length > 2)
+            while ((object)remaining != null && remaining.Length > 2)
            {
                LSL_Integer newLink = remaining.GetLSLIntegerItem(0);
                LSL_List newrules = remaining.GetSublist(1, -1);
author	Melanie	2012-08-16 02:46:48 +0100
committer	Melanie	2012-08-16 02:46:48 +0100
commit	90ad98370aead53e886832a83a3e8793f361426e (patch)
tree	b7076c5fb7ecf75d1ad31f7756543ade8fbf1b49 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parent	Remove AreUpdatesSuspended flag because it does nothing (diff)
parent	Do a proper null check to avoid the overloaded operator == trap (diff)
download	opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.zip opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.gz opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.bz2 opensim-SC_OLD-90ad98370aead53e886832a83a3e8793f361426e.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5f7b95f..d6aafaf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12124,7 +12124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12124		12124
12125	LSL_List remaining = SetPrimParams(obj, rules);	12125	LSL_List remaining = SetPrimParams(obj, rules);
12126		12126
12127	while (remaining != null && remaining.Length > 2)	12127	while ((object)remaining != null && remaining.Length > 2)
12128	{	12128	{
12129	LSL_Integer newLink = remaining.GetLSLIntegerItem(0);	12129	LSL_Integer newLink = remaining.GetLSLIntegerItem(0);
12130	LSL_List newrules = remaining.GetSublist(1, -1);	12130	LSL_List newrules = remaining.GetSublist(1, -1);