diff options
| author | Melanie | 2013-01-24 23:25:38 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-24 23:25:38 +0000 |
| commit | c6e6614a447b541d9d985c2a3dd3bb50a89f9b07 (patch) | |
| tree | 023ae4d98fdfb20e8d1cd9c6ce4988e4f2dec842 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make llGiveMoney async again. The return value is now the constant 1 to make (diff) | |
| download | opensim-SC-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.zip opensim-SC-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.gz opensim-SC-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.bz2 opensim-SC-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.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 8eeb4d2..9bf6f9b 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 | void llGiveMoney(string destination, int amount); | 211 | LSL_Integer 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); |