diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/OptionalModules/World/MoneyModule | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/MoneyModule')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 4cd5676..8565f5a 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -205,8 +205,9 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
205 | { | 205 | { |
206 | } | 206 | } |
207 | 207 | ||
208 | public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount) | 208 | public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount, UUID txn, out string result) |
209 | { | 209 | { |
210 | result = String.Empty; | ||
210 | string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); | 211 | string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); |
211 | 212 | ||
212 | bool give_result = doMoneyTransfer(fromID, toID, amount, 2, description); | 213 | bool give_result = doMoneyTransfer(fromID, toID, amount, 2, description); |
@@ -842,6 +843,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
842 | if (module != null) | 843 | if (module != null) |
843 | module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); | 844 | module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); |
844 | } | 845 | } |
846 | |||
847 | public void MoveMoney(UUID fromAgentID, UUID toAgentID, int amount, string text) | ||
848 | { | ||
849 | } | ||
845 | } | 850 | } |
846 | 851 | ||
847 | public enum TransactionType : int | 852 | public enum TransactionType : int |