diff options
| author | Melanie | 2012-12-03 19:46:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-12-03 19:46:16 +0100 |
| commit | b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef (patch) | |
| tree | ade7248fe85aa3c1f5702aa767809dd6e95dc6c3 /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| parent | *TEST* diferent avatar collider (diff) | |
| download | opensim-SC-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.zip opensim-SC-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.tar.gz opensim-SC-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.tar.bz2 opensim-SC-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 700f538..6b63d94 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -3013,7 +3013,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3013 | } | 3013 | } |
| 3014 | 3014 | ||
| 3015 | bool result = money.ObjectGiveMoney( | 3015 | bool result = money.ObjectGiveMoney( |
| 3016 | m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); | 3016 | m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount, UUID.Zero); |
| 3017 | 3017 | ||
| 3018 | if (result) | 3018 | if (result) |
| 3019 | return 1; | 3019 | return 1; |
| @@ -12529,7 +12529,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 12529 | } | 12529 | } |
| 12530 | 12530 | ||
| 12531 | bool result = money.ObjectGiveMoney( | 12531 | bool result = money.ObjectGiveMoney( |
| 12532 | m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount); | 12532 | m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount, txn); |
| 12533 | 12533 | ||
| 12534 | if (result) | 12534 | if (result) |
| 12535 | { | 12535 | { |