diff options
| author | Melanie | 2013-06-23 01:48:57 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:48:57 +0100 |
| commit | 24a4367fc2ff9456ec165db14a646dba977550a0 (patch) | |
| tree | f6880151d7b5e4749685dc4f4cc5d1130a9544e7 /OpenSim/Region/OptionalModules/World/MoneyModule | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix prim locking to behave like SL (diff) | |
| download | opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.zip opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.tar.gz opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.tar.bz2 opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/MoneyModule')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 25f198b..bcb21d0 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
| @@ -203,8 +203,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
| 203 | { | 203 | { |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount, UUID txn) | 206 | public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount, UUID txn, out string result) |
| 207 | { | 207 | { |
| 208 | result = String.Empty; | ||
| 208 | string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); | 209 | string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); |
| 209 | 210 | ||
| 210 | bool give_result = doMoneyTransfer(fromID, toID, amount, 2, description); | 211 | bool give_result = doMoneyTransfer(fromID, toID, amount, 2, description); |