Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2013-05-28 20:59:54 -0700
committer: Diva Canto 2013-05-28 20:59:54 -0700
commit: 233b9ec4d7739f324360366079469f2026c4ce41 (patch)
tree: 61266ac4ceffef23a74bad1dbd15bbe4fd103f82 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
parent: First change in Vivox for ages! -- added a lock to serialize calls to vivox s... (diff)
parent: BulletSim: don't zero motion when changing vehicle type. (diff)
download: opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.zip
opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.gz
opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.bz2
opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.xz
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 29f9591..32fb54b 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
                    remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got insufficient funds to create a group.");
                    return UUID.Zero;
                }
-                money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, "Group Creation");
+                money.ApplyCharge(GetRequestingAgentID(remoteClient), money.GroupCreationCharge, MoneyTransactionType.GroupCreate);
            }
            UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient));
author	Diva Canto	2013-05-28 20:59:54 -0700
committer	Diva Canto	2013-05-28 20:59:54 -0700
commit	233b9ec4d7739f324360366079469f2026c4ce41 (patch)
tree	61266ac4ceffef23a74bad1dbd15bbe4fd103f82 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
parent	First change in Vivox for ages! -- added a lock to serialize calls to vivox s... (diff)
parent	BulletSim: don't zero motion when changing vehicle type. (diff)
download	opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.zip opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.gz opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.bz2 opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 29f9591..32fb54b 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