aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-21 23:57:56 +0000
committerMelanie Thielker2009-07-21 23:57:56 +0000
commit7c747035ff6940a165de5c74105cfbd20d18a566 (patch)
treec994e789054868b79fc9ff2c20a4644c127d944f /OpenSim
parent* Updated C# WebServer to the latest available source download (r19869) and a... (diff)
downloadopensim-SC_OLD-7c747035ff6940a165de5c74105cfbd20d18a566.zip
opensim-SC_OLD-7c747035ff6940a165de5c74105cfbd20d18a566.tar.gz
opensim-SC_OLD-7c747035ff6940a165de5c74105cfbd20d18a566.tar.bz2
opensim-SC_OLD-7c747035ff6940a165de5c74105cfbd20d18a566.tar.xz
Thank you, MarcelEdward, for a patch to add paying group join fees.
Applied with changes (original patch would not compile) Whitespace changes removed Fixes Mantis #3926
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
index b43a6ac..4a46949 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
@@ -724,7 +724,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
724 remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists."); 724 remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists.");
725 return UUID.Zero; 725 return UUID.Zero;
726 } 726 }
727 727 // is there is a money module present ?
728 IMoneyModule money=remoteClient.Scene.RequestModuleInterface<IMoneyModule>();
729 if (money != null)
730 {
731 // do the transaction, that is if the agent has got sufficient funds
732 if (!money.GroupCreationCovered(remoteClient)) {
733 remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group.");
734 return UUID.Zero;
735 }
736 money.ApplyGroupCreationCharge(remoteClient.AgentId);
737 }
728 UUID groupID = m_groupData.CreateGroup(grID, name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, remoteClient.AgentId); 738 UUID groupID = m_groupData.CreateGroup(grID, name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, remoteClient.AgentId);
729 739
730 remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly"); 740 remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly");
@@ -733,6 +743,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
733 SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); 743 SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId);
734 744
735 return groupID; 745 return groupID;
746
736 } 747 }
737 748
738 public GroupNoticeData[] GroupNoticesListRequest(IClientAPI remoteClient, UUID groupID) 749 public GroupNoticeData[] GroupNoticesListRequest(IClientAPI remoteClient, UUID groupID)