1 files changed, 53 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 663ac0c..4c58e36 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -562,6 +562,25 @@ namespace OpenSim.Region.ScriptEngine.Common
                     return resolveName(SensedUUID);
                 }
             }
+            else
+            {
+                ScriptManager sm;
+                IScript script = null;
+
+                if ((sm = m_ScriptEngine.m_ScriptManager) != null)
+                {
+                    if (sm.Scripts.ContainsKey(m_localID))
+                    {
+                        if ((script = sm.GetScript(m_localID, m_itemID)) != null)
+                        {
+                            if (script.llDetectParams._bool.Length > number && script.llDetectParams._bool[number])
+                            {
+                                return script.llDetectParams._string[number];
+                            }
+                        }
+                    }
+                }
+            }
             return String.Empty;
        }
 
@@ -587,9 +606,12 @@ namespace OpenSim.Region.ScriptEngine.Common
                     {
                         if ((script = sm.GetScript(m_localID, m_itemID)) != null)
                         {
-                            if (script.llDetectParams._key[0])
+                            if (script.llDetectParams._bool.Length > number && script.llDetectParams._bool[number])
                             {
-                                return new LLUUID(script.llDetectParams._key[0]);
+                                LLUUID returnUUID = LLUUID.Zero;
+                                Helpers.TryParse(script.llDetectParams._key[number], out returnUUID);
+
+                                return returnUUID;
                             }
                         }
                     }
@@ -614,6 +636,35 @@ namespace OpenSim.Region.ScriptEngine.Common
                     return SensedObject;
                 }
             }
+            else
+            {
+                ScriptManager sm;
+                IScript script = null;
+
+                if ((sm = m_ScriptEngine.m_ScriptManager) != null)
+                {
+                    if (sm.Scripts.ContainsKey(m_localID))
+                    {
+                        if ((script = sm.GetScript(m_localID, m_itemID)) != null)
+                        {
+                            if (script.llDetectParams._key[number])
+                            {
+                                EntityBase SensedObject = null;
+                                LLUUID SensedUUID = LLUUID.Zero;
+                                Helpers.TryParse(script.llDetectParams._key.ToString(), out SensedUUID);
+                                if (SensedUUID == LLUUID.Zero)
+                                    return null;
+                                lock (World.Entities)
+                                {
+                                    World.Entities.TryGetValue(SensedUUID, out SensedObject);
+                                }
+                                return SensedObject;
+                                
+                            }
+                        }
+                    }
+                }
+            }
             return null;
         }