diff options
author | Diva Canto | 2013-08-09 08:31:30 -0700 |
---|---|---|
committer | Diva Canto | 2013-08-09 08:31:30 -0700 |
commit | 2cdcf62b48fde64d1ad11a4db46afeddff1a0770 (patch) | |
tree | 76d2f53def5e6cd05b9b9e5f3e3e1e759c29e87e /OpenSim/Framework/ChildAgentDataUpdate.cs | |
parent | Go easy on enforcing session ids in position updates (diff) | |
parent | BulletSim: adjust avatar position when the avatar's size is changed. (diff) | |
download | opensim-SC-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.zip opensim-SC-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.tar.gz opensim-SC-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.tar.bz2 opensim-SC-2cdcf62b48fde64d1ad11a4db46afeddff1a0770.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 1c5f558..18d008c 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -287,6 +287,12 @@ namespace OpenSim.Framework | |||
287 | public Vector3 AtAxis; | 287 | public Vector3 AtAxis; |
288 | public Vector3 LeftAxis; | 288 | public Vector3 LeftAxis; |
289 | public Vector3 UpAxis; | 289 | public Vector3 UpAxis; |
290 | |||
291 | /// <summary> | ||
292 | /// Signal on a V2 teleport that Scene.IncomingChildAgentDataUpdate(AgentData ad) should wait for the | ||
293 | /// scene presence to become root (triggered when the viewer sends a CompleteAgentMovement UDP packet after | ||
294 | /// establishing the connection triggered by it's receipt of a TeleportFinish EQ message). | ||
295 | /// </summary> | ||
290 | public bool SenderWantsToWaitForRoot; | 296 | public bool SenderWantsToWaitForRoot; |
291 | 297 | ||
292 | public float Far; | 298 | public float Far; |