Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-08-13 22:53:47 +01:00
15 changed files with 246 additions and 42 deletions

View File

@@ -1212,7 +1212,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
AgentDataMap.Add("AgentID", OSD.FromUUID(dataForAgentID));
AgentData.Add(AgentDataMap);
OSDArray GroupData = new OSDArray(data.Length);
OSDArray NewGroupData = new OSDArray(data.Length);