diff options
author | Melanie | 2013-08-13 22:53:47 +0100 |
---|---|---|
committer | Melanie | 2013-08-13 22:53:47 +0100 |
commit | 4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6 (patch) | |
tree | 245e7c3257c8c6c29356ba5c1eb61ae50a127226 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups | |
parent | Merge branch 'master' into careminster (diff) | |
parent | minor: Eliminate one of the duplicate 'have's in the HG message telling the u... (diff) | |
download | opensim-SC-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.zip opensim-SC-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.gz opensim-SC-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.bz2 opensim-SC-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index e0f061b..8a734e1 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -1212,7 +1212,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1212 | AgentDataMap.Add("AgentID", OSD.FromUUID(dataForAgentID)); | 1212 | AgentDataMap.Add("AgentID", OSD.FromUUID(dataForAgentID)); |
1213 | AgentData.Add(AgentDataMap); | 1213 | AgentData.Add(AgentDataMap); |
1214 | 1214 | ||
1215 | |||
1216 | OSDArray GroupData = new OSDArray(data.Length); | 1215 | OSDArray GroupData = new OSDArray(data.Length); |
1217 | OSDArray NewGroupData = new OSDArray(data.Length); | 1216 | OSDArray NewGroupData = new OSDArray(data.Length); |
1218 | 1217 | ||