Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 5 insertions, 4 deletions

diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 52f3e83..c72c742 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -32,15 +32,16 @@ namespace OpenSim.Framework
     public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount);
     public interface IMoneyModule
     {
-        bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
-                int amount);
+        bool ObjectGiveMoney(UUID objectID, UUID fromID,
+                UUID toID, int amount, UUID txn, out string reason);
 
         int GetBalance(UUID agentID);
         bool UploadCovered(UUID agentID, int amount);
         bool AmountCovered(UUID agentID, int amount);
-        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type);
-        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData);
+        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData = "");
         void ApplyUploadCharge(UUID agentID, int amount, string text);
+        void MoveMoney(UUID fromUser, UUID toUser, int amount, string text);
+        bool MoveMoney(UUID fromUser, UUID toUser, int amount, MoneyTransactionType type, string text);
 
         int UploadCharge { get; }
         int GroupCreationCharge { get; }