diff options
author | Melanie | 2012-02-14 23:16:20 +0100 |
---|---|---|
committer | Melanie | 2012-02-14 23:16:20 +0100 |
commit | 2d3381b795611a8857077d1effb41323c2cb8658 (patch) | |
tree | a1b8a6d7832858d14bfb08eac29fcf3e643ef17c /OpenSim/Framework | |
parent | Prevent object loss and positioning outside the region with failed object sim (diff) | |
download | opensim-SC_OLD-2d3381b795611a8857077d1effb41323c2cb8658.zip opensim-SC_OLD-2d3381b795611a8857077d1effb41323c2cb8658.tar.gz opensim-SC_OLD-2d3381b795611a8857077d1effb41323c2cb8658.tar.bz2 opensim-SC_OLD-2d3381b795611a8857077d1effb41323c2cb8658.tar.xz |
Implement region crossing of sitting avatars. Edit mode and llSetPos work
but unscripted default sit anim is lost. Still some Gfx glitching. Physical
crossing doesn't work yet.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 6d048f4..fe12874 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -308,6 +308,8 @@ namespace OpenSim.Framework | |||
308 | public Animation[] Anims; | 308 | public Animation[] Anims; |
309 | 309 | ||
310 | public UUID GranterID; | 310 | public UUID GranterID; |
311 | public UUID ParentPart; | ||
312 | public Vector3 SitOffset; | ||
311 | 313 | ||
312 | // Appearance | 314 | // Appearance |
313 | public AvatarAppearance Appearance; | 315 | public AvatarAppearance Appearance; |
@@ -468,6 +470,10 @@ namespace OpenSim.Framework | |||
468 | } | 470 | } |
469 | args["attach_objects"] = attObjs; | 471 | args["attach_objects"] = attObjs; |
470 | } | 472 | } |
473 | |||
474 | args["parent_part"] = OSD.FromUUID(ParentPart); | ||
475 | args["sit_offset"] = OSD.FromString(SitOffset.ToString()); | ||
476 | |||
471 | return args; | 477 | return args; |
472 | } | 478 | } |
473 | 479 | ||
@@ -675,6 +681,11 @@ namespace OpenSim.Framework | |||
675 | } | 681 | } |
676 | } | 682 | } |
677 | } | 683 | } |
684 | |||
685 | if (args["parent_part"] != null) | ||
686 | ParentPart = args["parent_part"].AsUUID(); | ||
687 | if (args["sit_offset"] != null) | ||
688 | Vector3.TryParse(args["sit_offset"].AsString(), out SitOffset); | ||
678 | } | 689 | } |
679 | 690 | ||
680 | public AgentData() | 691 | public AgentData() |