aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs23
-rw-r--r--OpenSim/Framework/IClientAPI.cs7
2 files changed, 4 insertions, 26 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 {
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 9bf51f8..018f194 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -47,9 +47,10 @@ namespace OpenSim.Framework
47 47
48 public delegate void ImprovedInstantMessage(IClientAPI remoteclient, GridInstantMessage im); 48 public delegate void ImprovedInstantMessage(IClientAPI remoteclient, GridInstantMessage im);
49 49
50 public delegate void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, 50 public delegate void RezObject(IClientAPI remoteClient, UUID itemID, UUID GroupID,
51 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 51 Vector3 RayEnd, Vector3 RayStart,
52 bool RezSelected, bool RemoveItem, UUID fromTaskID); 52 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
53 bool RezSelected, bool RemoveItem, UUID fromTaskID);
53 54
54 public delegate void RezRestoreToWorld(IClientAPI remoteClient, UUID itemId); 55 public delegate void RezRestoreToWorld(IClientAPI remoteClient, UUID itemId);
55 public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); 56 public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);