diff options
author | Melanie | 2013-01-23 19:31:27 +0000 |
---|---|---|
committer | Melanie | 2013-01-23 19:31:27 +0000 |
commit | fc1c77b42d6e35ecb6ad371484f355a3430018b1 (patch) | |
tree | e3c5fed0229a21902aa85a80b587e98fe397ac6c /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) and (diff) | |
download | opensim-SC-fc1c77b42d6e35ecb6ad371484f355a3430018b1.zip opensim-SC-fc1c77b42d6e35ecb6ad371484f355a3430018b1.tar.gz opensim-SC-fc1c77b42d6e35ecb6ad371484f355a3430018b1.tar.bz2 opensim-SC-fc1c77b42d6e35ecb6ad371484f355a3430018b1.tar.xz |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 9bf6f9b..8eeb4d2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
@@ -208,7 +208,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
208 | LSL_Float llGetWallclock(); | 208 | LSL_Float llGetWallclock(); |
209 | void llGiveInventory(string destination, string inventory); | 209 | void llGiveInventory(string destination, string inventory); |
210 | void llGiveInventoryList(string destination, string category, LSL_List inventory); | 210 | void llGiveInventoryList(string destination, string category, LSL_List inventory); |
211 | LSL_Integer llGiveMoney(string destination, int amount); | 211 | void llGiveMoney(string destination, int amount); |
212 | LSL_String llTransferLindenDollars(string destination, int amount); | 212 | LSL_String llTransferLindenDollars(string destination, int amount); |
213 | void llGodLikeRezObject(string inventory, LSL_Vector pos); | 213 | void llGodLikeRezObject(string inventory, LSL_Vector pos); |
214 | LSL_Float llGround(LSL_Vector offset); | 214 | LSL_Float llGround(LSL_Vector offset); |