ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 09:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bigmerge

Browse Source
This commit is contained in:
Melanie
2011-11-04 23:21:19 +00:00
parent 24235006f4 d7815ace4a
commit b9f7aebde3
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -1997,8 +1997,6 @@ namespace OpenSim.Region.Framework.Scenes
if (part.SitTargetAvatar == UUID)
part.SitTargetAvatar = UUID.Zero;
part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
ParentPosition = part.GetWorldPosition();
ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
}
@@ -2052,6 +2050,9 @@ namespace OpenSim.Region.Framework.Scenes
m_offsetRotation = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
SendAvatarDataToAllAgents();
m_requestedSitTargetID = 0;
if (part != null)
part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
}
Animator.UpdateMovementAnimations();