diff options
author | Teravus Ovares | 2008-04-22 10:11:29 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-22 10:11:29 +0000 |
commit | 61f23fa045b5df6110a5553042af2a23ddb160a2 (patch) | |
tree | 81037d3cfc0ecba0142f98fc3d11ca9b1a156c56 /OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |
parent | * Implemented NoScript areas (without loosing script state). (diff) | |
download | opensim-SC-61f23fa045b5df6110a5553042af2a23ddb160a2.zip opensim-SC-61f23fa045b5df6110a5553042af2a23ddb160a2.tar.gz opensim-SC-61f23fa045b5df6110a5553042af2a23ddb160a2.tar.bz2 opensim-SC-61f23fa045b5df6110a5553042af2a23ddb160a2.tar.xz |
* 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.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 13 |
1 files changed, 11 insertions, 2 deletions
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) |