diff options
author | Melanie | 2013-09-16 22:32:53 +0100 |
---|---|---|
committer | Melanie | 2013-09-16 22:32:53 +0100 |
commit | 72206a0e294865bf0c93ea16910276a188d51ce6 (patch) | |
tree | f7769826d78863b2e0e416fe529f0c55065e0acd /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Mono 2.0 fix - call ToArray() explicitly (diff) | |
download | opensim-SC-72206a0e294865bf0c93ea16910276a188d51ce6.zip opensim-SC-72206a0e294865bf0c93ea16910276a188d51ce6.tar.gz opensim-SC-72206a0e294865bf0c93ea16910276a188d51ce6.tar.bz2 opensim-SC-72206a0e294865bf0c93ea16910276a188d51ce6.tar.xz |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 88ecda2..183d8d1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -265,7 +265,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
265 | 265 | ||
266 | private int m_movementAnimationUpdateCounter = 0; | 266 | private int m_movementAnimationUpdateCounter = 0; |
267 | 267 | ||
268 | private Vector3 m_prevSitOffset; | 268 | public Vector3 PrevSitOffset { get; set; } |
269 | 269 | ||
270 | protected AvatarAppearance m_appearance; | 270 | protected AvatarAppearance m_appearance; |
271 | 271 | ||
@@ -997,7 +997,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
997 | // ParentPosition = part.GetWorldPosition(); | 997 | // ParentPosition = part.GetWorldPosition(); |
998 | ParentID = part.LocalId; | 998 | ParentID = part.LocalId; |
999 | ParentPart = part; | 999 | ParentPart = part; |
1000 | m_pos = m_prevSitOffset; | 1000 | m_pos = PrevSitOffset; |
1001 | // pos = ParentPosition; | 1001 | // pos = ParentPosition; |
1002 | pos = part.GetWorldPosition(); | 1002 | pos = part.GetWorldPosition(); |
1003 | } | 1003 | } |
@@ -2414,6 +2414,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2414 | 2414 | ||
2415 | if (ParentID != 0) | 2415 | if (ParentID != 0) |
2416 | { | 2416 | { |
2417 | PrevSitOffset = m_pos; // Save sit offset | ||
2417 | SceneObjectPart part = ParentPart; | 2418 | SceneObjectPart part = ParentPart; |
2418 | UnRegisterSeatControls(part.ParentGroup.UUID); | 2419 | UnRegisterSeatControls(part.ParentGroup.UUID); |
2419 | 2420 | ||
@@ -3649,7 +3650,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3649 | cAgent.Appearance = new AvatarAppearance(Appearance); | 3650 | cAgent.Appearance = new AvatarAppearance(Appearance); |
3650 | 3651 | ||
3651 | cAgent.ParentPart = ParentUUID; | 3652 | cAgent.ParentPart = ParentUUID; |
3652 | cAgent.SitOffset = m_pos; | 3653 | cAgent.SitOffset = PrevSitOffset; |
3653 | 3654 | ||
3654 | lock (scriptedcontrols) | 3655 | lock (scriptedcontrols) |
3655 | { | 3656 | { |
@@ -3692,7 +3693,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3692 | CameraLeftAxis = cAgent.LeftAxis; | 3693 | CameraLeftAxis = cAgent.LeftAxis; |
3693 | CameraUpAxis = cAgent.UpAxis; | 3694 | CameraUpAxis = cAgent.UpAxis; |
3694 | ParentUUID = cAgent.ParentPart; | 3695 | ParentUUID = cAgent.ParentPart; |
3695 | m_prevSitOffset = cAgent.SitOffset; | 3696 | PrevSitOffset = cAgent.SitOffset; |
3696 | 3697 | ||
3697 | // When we get to the point of re-computing neighbors everytime this | 3698 | // When we get to the point of re-computing neighbors everytime this |
3698 | // changes, then start using the agent's drawdistance rather than the | 3699 | // changes, then start using the agent's drawdistance rather than the |