diff options
| author | Melanie | 2013-05-30 21:48:09 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-30 21:48:09 +0100 |
| commit | 669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch) | |
| tree | 6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Try caching the user name for a new agent earlier on in the process of establ... (diff) | |
| download | opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2 opensim-SC-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index d764936..d0a5989 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
| @@ -764,7 +764,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 764 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got insufficient funds to create a group."); | 764 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got insufficient funds to create a group."); |
| 765 | return UUID.Zero; | 765 | return UUID.Zero; |
| 766 | } | 766 | } |
| 767 | money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, "Group Creation"); | 767 | money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, MoneyTransactionType.GroupCreate); |
| 768 | } | 768 | } |
| 769 | UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient)); | 769 | UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient)); |
| 770 | 770 | ||