aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2016-07-27 14:28:16 +0100
committerUbitUmarov2016-07-27 14:28:16 +0100
commite951f4cc96cd24388e83ed53afc8fd325ea5e874 (patch)
treeae6fd31750a655cabde7aaf42d357c35573706b7 /OpenSim/Framework
parent clear SitTargetAvatar on a sop copy (diff)
downloadopensim-SC_OLD-e951f4cc96cd24388e83ed53afc8fd325ea5e874.zip
opensim-SC_OLD-e951f4cc96cd24388e83ed53afc8fd325ea5e874.tar.gz
opensim-SC_OLD-e951f4cc96cd24388e83ed53afc8fd325ea5e874.tar.bz2
opensim-SC_OLD-e951f4cc96cd24388e83ed53afc8fd325ea5e874.tar.xz
a few more changes relative to sits crossing
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 663d0ef..74f18bf 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -356,7 +356,7 @@ namespace OpenSim.Framework
356 public string ActiveGroupName; 356 public string ActiveGroupName;
357 public string ActiveGroupTitle = null; 357 public string ActiveGroupTitle = null;
358 public UUID agentCOF; 358 public UUID agentCOF;
359 public bool isCrossingUpdate; 359 public byte CrossingFlags;
360 360
361 public AgentGroupData[] Groups; 361 public AgentGroupData[] Groups;
362 public Dictionary<ulong, string> ChildrenCapSeeds = null; 362 public Dictionary<ulong, string> ChildrenCapSeeds = null;
@@ -365,7 +365,6 @@ namespace OpenSim.Framework
365 public Animation AnimState = null; 365 public Animation AnimState = null;
366 public Byte MotionState = 0; 366 public Byte MotionState = 0;
367 367
368 public UUID GranterID;
369 public UUID ParentPart; 368 public UUID ParentPart;
370 public Vector3 SitOffset; 369 public Vector3 SitOffset;
371 370
@@ -430,7 +429,7 @@ namespace OpenSim.Framework
430 args["agent_access"] = OSD.FromString(AgentAccess.ToString()); 429 args["agent_access"] = OSD.FromString(AgentAccess.ToString());
431 430
432 args["agent_cof"] = OSD.FromUUID(agentCOF); 431 args["agent_cof"] = OSD.FromUUID(agentCOF);
433 args["crossingupdate"] = OSD.FromBoolean(isCrossingUpdate); 432 args["crossingflags"] = OSD.FromInteger(CrossingFlags);
434 433
435 args["active_group_id"] = OSD.FromUUID(ActiveGroupID); 434 args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
436 args["active_group_name"] = OSD.FromString(ActiveGroupName); 435 args["active_group_name"] = OSD.FromString(ActiveGroupName);
@@ -625,8 +624,8 @@ namespace OpenSim.Framework
625 if (args.ContainsKey("agent_cof") && args["agent_cof"] != null) 624 if (args.ContainsKey("agent_cof") && args["agent_cof"] != null)
626 agentCOF = args["agent_cof"].AsUUID(); 625 agentCOF = args["agent_cof"].AsUUID();
627 626
628 if (args.ContainsKey("crossingupdate") && args["crossingupdate"] != null) 627 if (args.ContainsKey("crossingflags") && args["crossingflags"] != null)
629 isCrossingUpdate = args["crossingupdate"].AsBoolean(); 628 CrossingFlags = (byte)args["crossingflags"].AsInteger();
630 629
631 if (args.ContainsKey("active_group_id") && args["active_group_id"] != null) 630 if (args.ContainsKey("active_group_id") && args["active_group_id"] != null)
632 ActiveGroupID = args["active_group_id"].AsUUID(); 631 ActiveGroupID = args["active_group_id"].AsUUID();