Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2017-08-16 05:05:57 +01:00
36 changed files with 786 additions and 508 deletions

View File

@@ -844,9 +844,14 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice);
}
public void MoveMoney(UUID fromAgentID, UUID toAgentID, int amount, string text)
public void MoveMoney(UUID fromUser, UUID toUser, int amount, string text)
{
}
public bool MoveMoney(UUID fromUser, UUID toUser, int amount, MoneyTransactionType type, string text)
{
return true;
}
}
public enum TransactionType : int