Stops animations on Teleports, to conform with what the viewer does.
							parent
							
								
									89f2589f6c
								
							
						
					
					
						commit
						f1795fd9b0
					
				| 
						 | 
				
			
			@ -71,6 +71,9 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
 | 
			
		|||
 | 
			
		||||
            IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
 | 
			
		||||
 | 
			
		||||
            // Reset animations; the viewer does that in teleports.
 | 
			
		||||
            avatar.ResetAnimations();
 | 
			
		||||
 | 
			
		||||
            if (regionHandle == m_regionInfo.RegionHandle)
 | 
			
		||||
            {
 | 
			
		||||
                // Teleport within the same region
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -689,6 +689,9 @@ namespace OpenSim.Region.Framework.Scenes
 | 
			
		|||
 | 
			
		||||
            IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
 | 
			
		||||
 | 
			
		||||
            // Reset animations; the viewer does that in teleports.
 | 
			
		||||
            avatar.ResetAnimations();
 | 
			
		||||
 | 
			
		||||
            if (regionHandle == m_regionInfo.RegionHandle)
 | 
			
		||||
            {
 | 
			
		||||
                m_log.DebugFormat(
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2472,6 +2472,11 @@ namespace OpenSim.Region.Framework.Scenes
 | 
			
		|||
        {
 | 
			
		||||
            // Put the child agent back at the center
 | 
			
		||||
            AbsolutePosition = new Vector3(128, 128, 70);
 | 
			
		||||
            ResetAnimations();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public void ResetAnimations()
 | 
			
		||||
        {
 | 
			
		||||
            m_animations.Clear();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue