* Implements llScriptDanger

* Made the scene's scriptDanger method more generic so both the llScriptDanger method and the Script engine method use the same private method.

3 files changed, 14 insertions, 5 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index 5d33294..7f41251 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -1421,9 +1421,9 @@ namespace OpenSim.Region.ScriptEngine.Common
             return m_LSL_Functions.llDumpList2String(src, seperator);
         }
 
-        public void llScriptDanger(LSL_Types.Vector3 pos)
+        public int llScriptDanger(LSL_Types.Vector3 pos)
         {
-            m_LSL_Functions.llScriptDanger(pos);
+            return m_LSL_Functions.llScriptDanger(pos);
         }
 
         public void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index fb436c7..41c3956 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3693,10 +3693,19 @@ namespace OpenSim.Region.ScriptEngine.Common
             return ret;
         }
 
-        public void llScriptDanger(LSL_Types.Vector3 pos)
+        public int llScriptDanger(LSL_Types.Vector3 pos)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llScriptDanger");
+            bool result = World.scriptDanger(m_host.LocalId, new LLVector3((float)pos.x, (float)pos.y, (float)pos.z));
+            if (result)
+            {
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+
         }
 
         public void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index fa957bb..a74340b 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -473,7 +473,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         //
         string llDumpList2String(LSL_Types.list src, string seperator);
         //wiki: integer llScriptDanger(vector pos)
-        void llScriptDanger(LSL_Types.Vector3 pos);
+        int llScriptDanger(LSL_Types.Vector3 pos);
         //wiki: llDialog( key avatar, string message, list buttons, integer chat_channel )
         void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel);
         //wiki: llVolumeDetect(integer detect)