diff options
author | Justin Clark-Casey (justincc) | 2013-01-24 00:03:44 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-24 00:03:44 +0000 |
commit | 55c6753b13d4c8cd69cc986db5f6e321b8e65bb7 (patch) | |
tree | 70ae7a976ba9be4e7e8d1cb98d3a6e61e4dfb7d4 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |
parent | Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini and... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.zip opensim-SC-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.gz opensim-SC-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.bz2 opensim-SC-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.xz |
Merge branch 'master' into cooptermination
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 36803a4..c7a7cf6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -869,9 +869,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
869 | m_LSL_Functions.llGiveInventoryList(destination, category, inventory); | 869 | m_LSL_Functions.llGiveInventoryList(destination, category, inventory); |
870 | } | 870 | } |
871 | 871 | ||
872 | public LSL_Integer llGiveMoney(string destination, int amount) | 872 | public void llGiveMoney(string destination, int amount) |
873 | { | 873 | { |
874 | return m_LSL_Functions.llGiveMoney(destination, amount); | 874 | m_LSL_Functions.llGiveMoney(destination, amount); |
875 | } | ||
876 | |||
877 | public LSL_String llTransferLindenDollars(string destination, int amount) | ||
878 | { | ||
879 | return m_LSL_Functions.llTransferLindenDollars(destination, amount); | ||
875 | } | 880 | } |
876 | 881 | ||
877 | public void llGodLikeRezObject(string inventory, LSL_Vector pos) | 882 | public void llGodLikeRezObject(string inventory, LSL_Vector pos) |