diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
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 | |||
1421 | return m_LSL_Functions.llDumpList2String(src, seperator); | 1421 | return m_LSL_Functions.llDumpList2String(src, seperator); |
1422 | } | 1422 | } |
1423 | 1423 | ||
1424 | public void llScriptDanger(LSL_Types.Vector3 pos) | 1424 | public int llScriptDanger(LSL_Types.Vector3 pos) |
1425 | { | 1425 | { |
1426 | m_LSL_Functions.llScriptDanger(pos); | 1426 | return m_LSL_Functions.llScriptDanger(pos); |
1427 | } | 1427 | } |
1428 | 1428 | ||
1429 | public void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel) | 1429 | 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 | |||
3693 | return ret; | 3693 | return ret; |
3694 | } | 3694 | } |
3695 | 3695 | ||
3696 | public void llScriptDanger(LSL_Types.Vector3 pos) | 3696 | public int llScriptDanger(LSL_Types.Vector3 pos) |
3697 | { | 3697 | { |
3698 | m_host.AddScriptLPS(1); | 3698 | m_host.AddScriptLPS(1); |
3699 | NotImplemented("llScriptDanger"); | 3699 | bool result = World.scriptDanger(m_host.LocalId, new LLVector3((float)pos.x, (float)pos.y, (float)pos.z)); |
3700 | if (result) | ||
3701 | { | ||
3702 | return 1; | ||
3703 | } | ||
3704 | else | ||
3705 | { | ||
3706 | return 0; | ||
3707 | } | ||
3708 | |||
3700 | } | 3709 | } |
3701 | 3710 | ||
3702 | public void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel) | 3711 | 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 | |||
473 | // | 473 | // |
474 | string llDumpList2String(LSL_Types.list src, string seperator); | 474 | string llDumpList2String(LSL_Types.list src, string seperator); |
475 | //wiki: integer llScriptDanger(vector pos) | 475 | //wiki: integer llScriptDanger(vector pos) |
476 | void llScriptDanger(LSL_Types.Vector3 pos); | 476 | int llScriptDanger(LSL_Types.Vector3 pos); |
477 | //wiki: llDialog( key avatar, string message, list buttons, integer chat_channel ) | 477 | //wiki: llDialog( key avatar, string message, list buttons, integer chat_channel ) |
478 | void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel); | 478 | void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel); |
479 | //wiki: llVolumeDetect(integer detect) | 479 | //wiki: llVolumeDetect(integer detect) |