diff options
author | UbitUmarov | 2016-08-04 22:54:29 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-04 22:54:29 +0100 |
commit | a90079bc92217325f1e284a679288df624b721b3 (patch) | |
tree | 3a17bbeaaa2f74137f7ce7dbc183384f5df8172f /OpenSim/Framework/ChildAgentDataUpdate.cs | |
parent | make sure all new scenepresences have fresh groups information at creation ti... (diff) | |
download | opensim-SC-a90079bc92217325f1e284a679288df624b721b3.zip opensim-SC-a90079bc92217325f1e284a679288df624b721b3.tar.gz opensim-SC-a90079bc92217325f1e284a679288df624b721b3.tar.bz2 opensim-SC-a90079bc92217325f1e284a679288df624b721b3.tar.xz |
cancel sending group powers on crossings, they are no longer needed.
Diffstat (limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 74f18bf..61c870e 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -358,7 +358,6 @@ namespace OpenSim.Framework | |||
358 | public UUID agentCOF; | 358 | public UUID agentCOF; |
359 | public byte CrossingFlags; | 359 | public byte CrossingFlags; |
360 | 360 | ||
361 | public AgentGroupData[] Groups; | ||
362 | public Dictionary<ulong, string> ChildrenCapSeeds = null; | 361 | public Dictionary<ulong, string> ChildrenCapSeeds = null; |
363 | public Animation[] Anims; | 362 | public Animation[] Anims; |
364 | public Animation DefaultAnim = null; | 363 | public Animation DefaultAnim = null; |
@@ -436,14 +435,6 @@ namespace OpenSim.Framework | |||
436 | if(ActiveGroupTitle != null) | 435 | if(ActiveGroupTitle != null) |
437 | args["active_group_title"] = OSD.FromString(ActiveGroupTitle); | 436 | args["active_group_title"] = OSD.FromString(ActiveGroupTitle); |
438 | 437 | ||
439 | if ((Groups != null) && (Groups.Length > 0)) | ||
440 | { | ||
441 | OSDArray groups = new OSDArray(Groups.Length); | ||
442 | foreach (AgentGroupData agd in Groups) | ||
443 | groups.Add(agd.PackUpdateMessage()); | ||
444 | args["groups"] = groups; | ||
445 | } | ||
446 | |||
447 | if (ChildrenCapSeeds != null && ChildrenCapSeeds.Count > 0) | 438 | if (ChildrenCapSeeds != null && ChildrenCapSeeds.Count > 0) |
448 | { | 439 | { |
449 | OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count); | 440 | OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count); |
@@ -636,20 +627,6 @@ namespace OpenSim.Framework | |||
636 | if(args.ContainsKey("active_group_title") && args["active_group_title"] != null) | 627 | if(args.ContainsKey("active_group_title") && args["active_group_title"] != null) |
637 | ActiveGroupTitle = args["active_group_title"].AsString(); | 628 | ActiveGroupTitle = args["active_group_title"].AsString(); |
638 | 629 | ||
639 | if (args.ContainsKey("groups") && (args["groups"] != null) && (args["groups"]).Type == OSDType.Array) | ||
640 | { | ||
641 | OSDArray groups = (OSDArray)(args["groups"]); | ||
642 | Groups = new AgentGroupData[groups.Count]; | ||
643 | int i = 0; | ||
644 | foreach (OSD o in groups) | ||
645 | { | ||
646 | if (o.Type == OSDType.Map) | ||
647 | { | ||
648 | Groups[i++] = new AgentGroupData((OSDMap)o); | ||
649 | } | ||
650 | } | ||
651 | } | ||
652 | |||
653 | if (args.ContainsKey("children_seeds") && (args["children_seeds"] != null) && | 630 | if (args.ContainsKey("children_seeds") && (args["children_seeds"] != null) && |
654 | (args["children_seeds"].Type == OSDType.Array)) | 631 | (args["children_seeds"].Type == OSDType.Array)) |
655 | { | 632 | { |