aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorBlueWall2014-03-31 15:50:27 -0400
committerBlueWall2014-03-31 15:50:27 -0400
commit4cbd45f3d50ed565ad4fc9fd9357723e1f095e7d (patch)
treef921d0efd18287bab29b50c9de862e3f345c0468 /OpenSim/Region
parentConsole command to change Estate owner (diff)
parentAdd check to prevent the return of a wrong value when key is NULL_KEY (diff)
downloadopensim-SC_OLD-4cbd45f3d50ed565ad4fc9fd9357723e1f095e7d.zip
opensim-SC_OLD-4cbd45f3d50ed565ad4fc9fd9357723e1f095e7d.tar.gz
opensim-SC_OLD-4cbd45f3d50ed565ad4fc9fd9357723e1f095e7d.tar.bz2
opensim-SC_OLD-4cbd45f3d50ed565ad4fc9fd9357723e1f095e7d.tar.xz
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
1 files changed, 4 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 4278002..86509aa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5173,8 +5173,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5173 // so the OR check may be a little redundant, but it's being done 5173 // so the OR check may be a little redundant, but it's being done
5174 // for completion and should LSL_Key ever be implemented 5174 // for completion and should LSL_Key ever be implemented
5175 // as it's own struct 5175 // as it's own struct
5176 // NOTE: 3rd case is needed because a NULL_KEY comes through as
5177 // type 'obj' and wrongly returns ""
5176 else if (!(src.Data[index] is LSL_String || 5178 else if (!(src.Data[index] is LSL_String ||
5177 src.Data[index] is LSL_Key)) 5179 src.Data[index] is LSL_Key ||
5180 src.Data[index] == "00000000-0000-0000-0000-000000000000"))
5178 { 5181 {
5179 return ""; 5182 return "";
5180 } 5183 }