aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorMelanie2013-01-24 23:25:38 +0000
committerMelanie2013-01-24 23:25:38 +0000
commitc6e6614a447b541d9d985c2a3dd3bb50a89f9b07 (patch)
tree023ae4d98fdfb20e8d1cd9c6ce4988e4f2dec842 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentMerge branch 'master' into careminster (diff)
parentMake llGiveMoney async again. The return value is now the constant 1 to make (diff)
downloadopensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.zip
opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.gz
opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.bz2
opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs4
1 files changed, 2 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 ef71d7b..8ecc4f8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -876,9 +876,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
876 m_LSL_Functions.llGiveInventoryList(destination, category, inventory); 876 m_LSL_Functions.llGiveInventoryList(destination, category, inventory);
877 } 877 }
878 878
879 public void llGiveMoney(string destination, int amount) 879 public LSL_Integer llGiveMoney(string destination, int amount)
880 { 880 {
881 m_LSL_Functions.llGiveMoney(destination, amount); 881 return m_LSL_Functions.llGiveMoney(destination, amount);
882 } 882 }
883 883
884 public LSL_String llTransferLindenDollars(string destination, int amount) 884 public LSL_String llTransferLindenDollars(string destination, int amount)