diff options
author | Melanie | 2012-01-28 00:18:12 +0000 |
---|---|---|
committer | Melanie | 2012-01-28 00:18:12 +0000 |
commit | 7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6 (patch) | |
tree | e09e0fde68b645af20a37608bc45a0a6e9417cd0 /OpenSim/Region/OptionalModules | |
parent | Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate(). (diff) | |
download | opensim-SC_OLD-7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6.zip opensim-SC_OLD-7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6.tar.gz opensim-SC_OLD-7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6.tar.bz2 opensim-SC_OLD-7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6.tar.xz |
Remove IClientAPI from the money module. It was only used to pass in the
agent id anyway
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 740dbdd..b60cd42 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -713,7 +713,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
713 | if (money != null) | 713 | if (money != null) |
714 | { | 714 | { |
715 | // do the transaction, that is if the agent has got sufficient funds | 715 | // do the transaction, that is if the agent has got sufficient funds |
716 | if (!money.AmountCovered(remoteClient, money.GroupCreationCharge)) { | 716 | if (!money.AmountCovered(remoteClient.AgentId, money.GroupCreationCharge)) { |
717 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group."); | 717 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group."); |
718 | return UUID.Zero; | 718 | return UUID.Zero; |
719 | } | 719 | } |
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 8fc50ff..9c838d0 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -775,11 +775,11 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
775 | // Please do not refactor these to be just one method | 775 | // Please do not refactor these to be just one method |
776 | // Existing implementations need the distinction | 776 | // Existing implementations need the distinction |
777 | // | 777 | // |
778 | public bool UploadCovered(IClientAPI client, int amount) | 778 | public bool UploadCovered(UUID agentID, int amount) |
779 | { | 779 | { |
780 | return true; | 780 | return true; |
781 | } | 781 | } |
782 | public bool AmountCovered(IClientAPI client, int amount) | 782 | public bool AmountCovered(UUID agentID, int amount) |
783 | { | 783 | { |
784 | return true; | 784 | return true; |
785 | } | 785 | } |