OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor 

Also fix the failure to fire CHANGED_LINK on sit, which is different in our
code.
avinationmerge
Melanie 2010-12-14 12:12:27 +00:00
parent 2d9946d7c9 e47cc10674
commit cb51fc129e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1837,8 +1837,7 @@ namespace OpenSim.Region.Framework.Scenes
// Reset sit target. // Reset sit target.
if (part.GetAvatarOnSitTarget() == UUID) if (part.GetAvatarOnSitTarget() == UUID)
part.SitTargetAvatar = UUID.Zero; part.SitTargetAvatar = UUID.Zero;
if (part.ParentGroup != null) part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
m_parentPosition = part.GetWorldPosition(); m_parentPosition = part.GetWorldPosition();
ControllingClient.SendClearFollowCamProperties(part.ParentUUID); ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
@ -2033,6 +2032,9 @@ namespace OpenSim.Region.Framework.Scenes
else return; // occupied small else return; // occupied small
} // end large/small } // end large/small
} // end Scripted/not } // end Scripted/not
part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
cameraAtOffset = part.GetCameraAtOffset(); cameraAtOffset = part.GetCameraAtOffset();
cameraEyeOffset = part.GetCameraEyeOffset(); cameraEyeOffset = part.GetCameraEyeOffset();
forceMouselook = part.GetForceMouselook(); forceMouselook = part.GetForceMouselook();