aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-06-03 04:28:43 +0100
committerUbitUmarov2017-06-03 04:28:43 +0100
commit67e540e05c34667b771fb5d95e4d7bdc0dfce24d (patch)
treefc22340e9872221198d4e6bdcdf021e0e59b4889 /OpenSim/Framework
parentfix MouseDown in case it gets any use (diff)
downloadopensim-SC-67e540e05c34667b771fb5d95e4d7bdc0dfce24d.zip
opensim-SC-67e540e05c34667b771fb5d95e4d7bdc0dfce24d.tar.gz
opensim-SC-67e540e05c34667b771fb5d95e4d7bdc0dfce24d.tar.bz2
opensim-SC-67e540e05c34667b771fb5d95e4d7bdc0dfce24d.tar.xz
cross mouse buttons state
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index d6d8dde..ee5007a 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -375,6 +375,7 @@ namespace OpenSim.Framework
375 public string ActiveGroupTitle = null; 375 public string ActiveGroupTitle = null;
376 public UUID agentCOF; 376 public UUID agentCOF;
377 public byte CrossingFlags; 377 public byte CrossingFlags;
378 public byte CrossExtraFlags;
378 379
379 public Dictionary<ulong, string> ChildrenCapSeeds = null; 380 public Dictionary<ulong, string> ChildrenCapSeeds = null;
380 public Animation[] Anims; 381 public Animation[] Anims;
@@ -454,6 +455,8 @@ namespace OpenSim.Framework
454 455
455 args["agent_cof"] = OSD.FromUUID(agentCOF); 456 args["agent_cof"] = OSD.FromUUID(agentCOF);
456 args["crossingflags"] = OSD.FromInteger(CrossingFlags); 457 args["crossingflags"] = OSD.FromInteger(CrossingFlags);
458 if(CrossingFlags != 0)
459 args["crossExtraFlags"] = OSD.FromInteger(CrossExtraFlags);
457 460
458 args["active_group_id"] = OSD.FromUUID(ActiveGroupID); 461 args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
459 args["active_group_name"] = OSD.FromString(ActiveGroupName); 462 args["active_group_name"] = OSD.FromString(ActiveGroupName);
@@ -646,6 +649,12 @@ namespace OpenSim.Framework
646 if (args.ContainsKey("crossingflags") && args["crossingflags"] != null) 649 if (args.ContainsKey("crossingflags") && args["crossingflags"] != null)
647 CrossingFlags = (byte)args["crossingflags"].AsInteger(); 650 CrossingFlags = (byte)args["crossingflags"].AsInteger();
648 651
652 if(CrossingFlags != 0)
653 {
654 if (args.ContainsKey("crossExtraFlags") && args["crossExtraFlags"] != null)
655 CrossExtraFlags = (byte)args["crossExtraFlags"].AsInteger();
656 }
657
649 if (args.ContainsKey("active_group_id") && args["active_group_id"] != null) 658 if (args.ContainsKey("active_group_id") && args["active_group_id"] != null)
650 ActiveGroupID = args["active_group_id"].AsUUID(); 659 ActiveGroupID = args["active_group_id"].AsUUID();
651 660