Clean up IMoneyModule and adjust the other modules to the changes
parent
beb5259cd1
commit
c87e6a289c
|
@ -814,7 +814,7 @@ namespace OpenSim.Framework.Capabilities
|
||||||
|
|
||||||
if (mm != null)
|
if (mm != null)
|
||||||
{
|
{
|
||||||
if (!mm.UploadCovered(client))
|
if (!mm.UploadCovered(client, mm.UploadCharge))
|
||||||
{
|
{
|
||||||
if (client != null)
|
if (client != null)
|
||||||
client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
|
client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
|
||||||
|
|
|
@ -35,13 +35,14 @@ namespace OpenSim.Framework
|
||||||
bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
|
bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
|
||||||
int amount);
|
int amount);
|
||||||
|
|
||||||
int GetBalance(IClientAPI client);
|
int GetBalance(UUID agentID);
|
||||||
void ApplyUploadCharge(UUID agentID);
|
bool UploadCovered(IClientAPI client, int amount);
|
||||||
bool UploadCovered(IClientAPI client);
|
|
||||||
void ApplyGroupCreationCharge(UUID agentID);
|
|
||||||
bool GroupCreationCovered(IClientAPI client);
|
|
||||||
bool AmountCovered(IClientAPI client, int amount);
|
bool AmountCovered(IClientAPI client, int amount);
|
||||||
void ApplyCharge(UUID agentID, int amount, string text);
|
void ApplyCharge(UUID agentID, int amount, string text);
|
||||||
|
void ApplyUploadCharge(UUID agentID, int amount, string text);
|
||||||
|
|
||||||
|
int UploadCharge { get; }
|
||||||
|
int GroupCreationCharge { get; }
|
||||||
|
|
||||||
event ObjectPaid OnObjectPaid;
|
event ObjectPaid OnObjectPaid;
|
||||||
}
|
}
|
||||||
|
|
|
@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
|
||||||
|
|
||||||
if (mm != null)
|
if (mm != null)
|
||||||
{
|
{
|
||||||
if (!mm.UploadCovered(remoteClient))
|
if (!mm.UploadCovered(remoteClient, mm.UploadCharge))
|
||||||
{
|
{
|
||||||
remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
|
remoteClient.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
IMoneyModule money=RequestModuleInterface<IMoneyModule>();
|
IMoneyModule money=RequestModuleInterface<IMoneyModule>();
|
||||||
if (money != null)
|
if (money != null)
|
||||||
{
|
{
|
||||||
money.ApplyUploadCharge(agentID);
|
money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload");
|
||||||
}
|
}
|
||||||
|
|
||||||
AddInventoryItem(agentID, item);
|
AddInventoryItem(agentID, item);
|
||||||
|
|
|
@ -722,11 +722,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
|
||||||
if (money != null)
|
if (money != null)
|
||||||
{
|
{
|
||||||
// do the transaction, that is if the agent has got sufficient funds
|
// do the transaction, that is if the agent has got sufficient funds
|
||||||
if (!money.GroupCreationCovered(remoteClient)) {
|
if (!money.AmountCovered(remoteClient, money.GroupCreationCharge)) {
|
||||||
remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group.");
|
remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group.");
|
||||||
return UUID.Zero;
|
return UUID.Zero;
|
||||||
}
|
}
|
||||||
money.ApplyGroupCreationCharge(GetRequestingAgentID(remoteClient));
|
money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, "Group Creation");
|
||||||
}
|
}
|
||||||
UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient));
|
UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient));
|
||||||
|
|
||||||
|
|
|
@ -108,6 +108,16 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
|
||||||
|
|
||||||
public event ObjectPaid OnObjectPaid;
|
public event ObjectPaid OnObjectPaid;
|
||||||
|
|
||||||
|
public int UploadCharge
|
||||||
|
{
|
||||||
|
get { return 0; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public int GroupCreationCharge
|
||||||
|
{
|
||||||
|
get { return 0; }
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Startup
|
/// Startup
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -188,17 +198,12 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
|
||||||
// Please do not refactor these to be just one method
|
// Please do not refactor these to be just one method
|
||||||
// Existing implementations need the distinction
|
// Existing implementations need the distinction
|
||||||
//
|
//
|
||||||
public void ApplyUploadCharge(UUID agentID)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ApplyGroupCreationCharge(UUID agentID)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ApplyCharge(UUID agentID, int amount, string text)
|
public void ApplyCharge(UUID agentID, int amount, string text)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
public void ApplyUploadCharge(UUID agentID, int amount, string text)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount)
|
public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount)
|
||||||
{
|
{
|
||||||
|
@ -769,7 +774,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
|
||||||
//m_log.Info("[FRIEND]: " + avatar.Name + " status:" + (!avatar.IsChildAgent).ToString());
|
//m_log.Info("[FRIEND]: " + avatar.Name + " status:" + (!avatar.IsChildAgent).ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
public int GetBalance(IClientAPI client)
|
public int GetBalance(UUID agentID)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -777,16 +782,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
|
||||||
// Please do not refactor these to be just one method
|
// Please do not refactor these to be just one method
|
||||||
// Existing implementations need the distinction
|
// Existing implementations need the distinction
|
||||||
//
|
//
|
||||||
public bool UploadCovered(IClientAPI client)
|
public bool UploadCovered(IClientAPI client, int amount)
|
||||||
{
|
{
|
||||||
return AmountCovered(client, PriceUpload);
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool GroupCreationCovered(IClientAPI client)
|
|
||||||
{
|
|
||||||
return AmountCovered(client, PriceGroupCreate);
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool AmountCovered(IClientAPI client, int amount)
|
public bool AmountCovered(IClientAPI client, int amount)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in New Issue