diff options
| author | Melanie | 2013-05-30 21:48:09 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-30 21:48:09 +0100 |
| commit | 669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch) | |
| tree | 6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Framework/IMoneyModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Try caching the user name for a new agent earlier on in the process of establ... (diff) | |
| download | opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2 opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to 'OpenSim/Framework/IMoneyModule.cs')
| -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 7378d2e..415b7df 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 | void MoveMoney(UUID fromUser, UUID toUser, int amount, string text); | 44 | void MoveMoney(UUID fromUser, UUID toUser, int amount, string text); |
| 44 | 45 | ||