diff options
| author | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
| commit | 8c12f22140d2885bb79aa4e201345ae6fd45fec6 (patch) | |
| tree | e6d3fd25eafdee7f790f54d092e8494be4715149 /OpenSim/Region/OptionalModules/Avatar | |
| parent | Add textures no longer shipped with newer viewers to OpenSim's standard asset... (diff) | |
| parent | Prevent a bad cast in llCreateLink(). (diff) | |
| download | opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.zip opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.gz opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.bz2 opensim-SC-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
| -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 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)); |