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

Stops animations on Teleports, to conform with what the viewer does.

GenericGridServerConcept
diva 2009-02-18 21:28:54 +00:00
parent 89f2589f6c
commit f1795fd9b0
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
View File

@ -71,6 +71,9 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
// Reset animations; the viewer does that in teleports.
avatar.ResetAnimations();
if (regionHandle == m_regionInfo.RegionHandle) if (regionHandle == m_regionInfo.RegionHandle)
{ {
// Teleport within the same region // Teleport within the same region

3
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -689,6 +689,9 @@ namespace OpenSim.Region.Framework.Scenes
IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
// Reset animations; the viewer does that in teleports.
avatar.ResetAnimations();
if (regionHandle == m_regionInfo.RegionHandle) if (regionHandle == m_regionInfo.RegionHandle)
{ {
m_log.DebugFormat( m_log.DebugFormat(

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

@ -2472,6 +2472,11 @@ namespace OpenSim.Region.Framework.Scenes
{ {
// Put the child agent back at the center // Put the child agent back at the center
AbsolutePosition = new Vector3(128, 128, 70); AbsolutePosition = new Vector3(128, 128, 70);
ResetAnimations();
}
public void ResetAnimations()
{
m_animations.Clear(); m_animations.Clear();
} }