Make Keyframe motion cross regions again
parent
2ad72db0ec
commit
34bb2fd015
|
@ -276,6 +276,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
|
||||
newMotion.m_timerStopped = false;
|
||||
newMotion.m_running = true;
|
||||
newMotion.m_isCrossing = false;
|
||||
newMotion.m_waitingCrossing = false;
|
||||
}
|
||||
|
|
|
@ -2769,8 +2769,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
if (newPosition != Vector3.Zero)
|
||||
newObject.RootPart.GroupPosition = newPosition;
|
||||
if (newObject.RootPart.KeyframeMotion != null)
|
||||
newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
|
||||
|
||||
if (!AddSceneObject(newObject))
|
||||
{
|
||||
|
@ -2798,6 +2796,9 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
// before we restart the scripts, or else some functions won't work.
|
||||
newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
|
||||
newObject.ResumeScripts();
|
||||
|
||||
if (newObject.RootPart.KeyframeMotion != null)
|
||||
newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
|
||||
}
|
||||
|
||||
// Do this as late as possible so that listeners have full access to the incoming object
|
||||
|
|
Loading…
Reference in New Issue