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

Make Keyframe motion cross regions again

avinationmerge
Melanie 2013-03-03 12:48:36 +01:00
parent 2ad72db0ec
commit 34bb2fd015
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
View File

@ -276,6 +276,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
newMotion.m_timerStopped = false; newMotion.m_timerStopped = false;
newMotion.m_running = true;
newMotion.m_isCrossing = false; newMotion.m_isCrossing = false;
newMotion.m_waitingCrossing = false; newMotion.m_waitingCrossing = false;
} }

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

@ -2769,8 +2769,6 @@ namespace OpenSim.Region.Framework.Scenes
if (newPosition != Vector3.Zero) if (newPosition != Vector3.Zero)
newObject.RootPart.GroupPosition = newPosition; newObject.RootPart.GroupPosition = newPosition;
if (newObject.RootPart.KeyframeMotion != null)
newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
if (!AddSceneObject(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. // before we restart the scripts, or else some functions won't work.
newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
newObject.ResumeScripts(); 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 // Do this as late as possible so that listeners have full access to the incoming object