Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-08-18 00:59:20 +0100
committer: Melanie 2010-08-18 00:59:20 +0100
commit: e74809ff4c7fd67ceb5336e5d8e7811591f6cce3 (patch)
tree: 3e878fb80be75106631d76a12b8da9e65e98f7b9 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups
parent: Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent: * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() t... (diff)
download: opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.zip
opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.gz
opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.bz2
opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.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 3f15b69..2969503 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1129,7 +1129,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                OSDMap NewGroupDataMap = new OSDMap(1);
                GroupDataMap.Add("GroupID", OSD.FromUUID(membership.GroupID));
-                GroupDataMap.Add("GroupPowers", OSD.FromBinary(membership.GroupPowers));
+                GroupDataMap.Add("GroupPowers", OSD.FromULong(membership.GroupPowers));
                GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(membership.AcceptNotices));
                GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(membership.GroupPicture));
                GroupDataMap.Add("Contribution", OSD.FromInteger(membership.Contribution));
author	Melanie	2010-08-18 00:59:20 +0100
committer	Melanie	2010-08-18 00:59:20 +0100
commit	e74809ff4c7fd67ceb5336e5d8e7811591f6cce3 (patch)
tree	3e878fb80be75106631d76a12b8da9e65e98f7b9 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups
parent	Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent	* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() t... (diff)
download	opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.zip opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.gz opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.bz2 opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 3f15b69..2969503 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1129,7 +1129,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1129	OSDMap NewGroupDataMap = new OSDMap(1);	1129	OSDMap NewGroupDataMap = new OSDMap(1);
1130		1130
1131	GroupDataMap.Add("GroupID", OSD.FromUUID(membership.GroupID));	1131	GroupDataMap.Add("GroupID", OSD.FromUUID(membership.GroupID));
1132	GroupDataMap.Add("GroupPowers", OSD.FromBinary(membership.GroupPowers));	1132	GroupDataMap.Add("GroupPowers", OSD.FromULong(membership.GroupPowers));
1133	GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(membership.AcceptNotices));	1133	GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(membership.AcceptNotices));
1134	GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(membership.GroupPicture));	1134	GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(membership.GroupPicture));
1135	GroupDataMap.Add("Contribution", OSD.FromInteger(membership.Contribution));	1135	GroupDataMap.Add("Contribution", OSD.FromInteger(membership.Contribution));