diff options
author | Melanie | 2012-12-03 19:34:22 +0100 |
---|---|---|
committer | Melanie | 2012-12-03 19:34:22 +0100 |
commit | d3904ff48464fcde5266aac08b5c95227acbbcb1 (patch) | |
tree | e4e56e283647ec8ec728d0e7216becfa2c3b7ed8 | |
parent | Merge branch 'teravuswork' of careminster:/var/git/careminster into teravuswork (diff) | |
download | opensim-SC_OLD-d3904ff48464fcde5266aac08b5c95227acbbcb1.zip opensim-SC_OLD-d3904ff48464fcde5266aac08b5c95227acbbcb1.tar.gz opensim-SC_OLD-d3904ff48464fcde5266aac08b5c95227acbbcb1.tar.bz2 opensim-SC_OLD-d3904ff48464fcde5266aac08b5c95227acbbcb1.tar.xz |
Add a transaction ID to the money module path for llTransferLindenDollars
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs index 71de93a..7378d2e 100644 --- a/OpenSim/Framework/IMoneyModule.cs +++ b/OpenSim/Framework/IMoneyModule.cs | |||
@@ -33,7 +33,7 @@ namespace OpenSim.Framework | |||
33 | public interface IMoneyModule | 33 | public interface IMoneyModule |
34 | { | 34 | { |
35 | bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, | 35 | bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, |
36 | int amount); | 36 | int amount, UUID txn); |
37 | 37 | ||
38 | int GetBalance(UUID agentID); | 38 | int GetBalance(UUID agentID); |
39 | bool UploadCovered(UUID agentID, int amount); | 39 | bool UploadCovered(UUID agentID, int amount); |
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index c0d1355..c7e3a7a 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -199,7 +199,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
199 | { | 199 | { |
200 | } | 200 | } |
201 | 201 | ||
202 | public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount) | 202 | public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount, UUID txn) |
203 | { | 203 | { |
204 | string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); | 204 | string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); |
205 | 205 | ||
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 | { |