diff options
| author | UbitUmarov | 2017-08-16 05:05:57 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-08-16 05:05:57 +0100 |
| commit | 6d4b0a8ce3713eb45170f50b71d295ebaef0e51d (patch) | |
| tree | ba57d22e92ae6cadef8af599a2aa4f2a78057fce /OpenSim/Framework/IMoneyModule.cs | |
| parent | fix merge issues (diff) | |
| parent | Merge branch 'master' into BulletSim2017 (diff) | |
| download | opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.zip opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.gz opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.bz2 opensim-SC-6d4b0a8ce3713eb45170f50b71d295ebaef0e51d.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/IMoneyModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs index be45438..c72c742 100644 --- a/OpenSim/Framework/IMoneyModule.cs +++ b/OpenSim/Framework/IMoneyModule.cs | |||
| @@ -41,6 +41,7 @@ namespace OpenSim.Framework | |||
| 41 | void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData = ""); | 41 | void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData = ""); |
| 42 | void ApplyUploadCharge(UUID agentID, int amount, string text); | 42 | void ApplyUploadCharge(UUID agentID, int amount, string text); |
| 43 | void MoveMoney(UUID fromUser, UUID toUser, int amount, string text); | 43 | void MoveMoney(UUID fromUser, UUID toUser, int amount, string text); |
| 44 | bool MoveMoney(UUID fromUser, UUID toUser, int amount, MoneyTransactionType type, string text); | ||
| 44 | 45 | ||
| 45 | int UploadCharge { get; } | 46 | int UploadCharge { get; } |
| 46 | int GroupCreationCharge { get; } | 47 | int GroupCreationCharge { get; } |