diff options
author | Diva Canto | 2013-05-28 20:59:54 -0700 |
---|---|---|
committer | Diva Canto | 2013-05-28 20:59:54 -0700 |
commit | 233b9ec4d7739f324360366079469f2026c4ce41 (patch) | |
tree | 61266ac4ceffef23a74bad1dbd15bbe4fd103f82 /OpenSim/Framework/IMoneyModule.cs | |
parent | First change in Vivox for ages! -- added a lock to serialize calls to vivox s... (diff) | |
parent | BulletSim: don't zero motion when changing vehicle type. (diff) | |
download | opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.zip opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.gz opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.bz2 opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IMoneyModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs index 1e09728..52f3e83 100644 --- a/OpenSim/Framework/IMoneyModule.cs +++ b/OpenSim/Framework/IMoneyModule.cs | |||
@@ -38,7 +38,8 @@ namespace OpenSim.Framework | |||
38 | int GetBalance(UUID agentID); | 38 | int GetBalance(UUID agentID); |
39 | bool UploadCovered(UUID agentID, int amount); | 39 | bool UploadCovered(UUID agentID, int amount); |
40 | bool AmountCovered(UUID agentID, int amount); | 40 | bool AmountCovered(UUID agentID, int amount); |
41 | void ApplyCharge(UUID agentID, int amount, string text); | 41 | void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type); |
42 | void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData); | ||
42 | void ApplyUploadCharge(UUID agentID, int amount, string text); | 43 | void ApplyUploadCharge(UUID agentID, int amount, string text); |
43 | 44 | ||
44 | int UploadCharge { get; } | 45 | int UploadCharge { get; } |