diff options
| author | Melanie | 2012-12-18 09:48:12 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-18 09:48:12 +0000 |
| commit | 79bdf464d3f123f8e195fa57c497e546b7d9dfcc (patch) | |
| tree | bf6123b15d1ced7ec72ce871e4801d6645bb23f4 /OpenSim/Region/OptionalModules/World | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix locking for good (diff) | |
| download | opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.zip opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.gz opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.bz2 opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||