diff options
author | Diva Canto | 2013-06-30 08:39:35 -0700 |
---|---|---|
committer | Diva Canto | 2013-06-30 08:39:35 -0700 |
commit | e377abcc35c5fb4d47418524ae68364705995915 (patch) | |
tree | 38887ef4bdab9206a414f60eb2c9077ccda07272 /OpenSim/Addons/Groups/GroupsModule.cs | |
parent | Revert "More debug mantis #6625" (diff) | |
download | opensim-SC_OLD-e377abcc35c5fb4d47418524ae68364705995915.zip opensim-SC_OLD-e377abcc35c5fb4d47418524ae68364705995915.tar.gz opensim-SC_OLD-e377abcc35c5fb4d47418524ae68364705995915.tar.bz2 opensim-SC_OLD-e377abcc35c5fb4d47418524ae68364705995915.tar.xz |
Groups V2: charge for group creation only after the group has been successfully created
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Addons/Groups/GroupsModule.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index 5b3b9f6..5959bac 100644 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs | |||
@@ -766,14 +766,17 @@ namespace OpenSim.Groups | |||
766 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "Insufficient funds to create a group."); | 766 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "Insufficient funds to create a group."); |
767 | return UUID.Zero; | 767 | return UUID.Zero; |
768 | } | 768 | } |
769 | money.ApplyCharge(remoteClient.AgentId, money.GroupCreationCharge, MoneyTransactionType.GroupCreate); | ||
770 | } | 769 | } |
770 | |||
771 | string reason = string.Empty; | 771 | string reason = string.Empty; |
772 | UUID groupID = m_groupData.CreateGroup(remoteClient.AgentId, name, charter, showInList, insigniaID, membershipFee, openEnrollment, | 772 | UUID groupID = m_groupData.CreateGroup(remoteClient.AgentId, name, charter, showInList, insigniaID, membershipFee, openEnrollment, |
773 | allowPublish, maturePublish, remoteClient.AgentId, out reason); | 773 | allowPublish, maturePublish, remoteClient.AgentId, out reason); |
774 | 774 | ||
775 | if (groupID != UUID.Zero) | 775 | if (groupID != UUID.Zero) |
776 | { | 776 | { |
777 | if (money != null) | ||
778 | money.ApplyCharge(remoteClient.AgentId, money.GroupCreationCharge, MoneyTransactionType.GroupCreate); | ||
779 | |||
777 | remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly"); | 780 | remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly"); |
778 | 781 | ||
779 | // Update the founder with new group information. | 782 | // Update the founder with new group information. |