aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-02-18 21:28:54 +0000
committerdiva2009-02-18 21:28:54 +0000
commitf1795fd9b043fc32e87a5f611ba795122f3fbaef (patch)
treecbac393cf2bd696c2e97d1e641010ca7a38c96c3
parent* Change AssetGatherer method access so that only methods which are worth cal... (diff)
downloadopensim-SC_OLD-f1795fd9b043fc32e87a5f611ba795122f3fbaef.zip
opensim-SC_OLD-f1795fd9b043fc32e87a5f611ba795122f3fbaef.tar.gz
opensim-SC_OLD-f1795fd9b043fc32e87a5f611ba795122f3fbaef.tar.bz2
opensim-SC_OLD-f1795fd9b043fc32e87a5f611ba795122f3fbaef.tar.xz
Stops animations on Teleports, to conform with what the viewer does.
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
3 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index f75ea8e..0faeef1 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -71,6 +71,9 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
71 71
72 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); 72 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
73 73
74 // Reset animations; the viewer does that in teleports.
75 avatar.ResetAnimations();
76
74 if (regionHandle == m_regionInfo.RegionHandle) 77 if (regionHandle == m_regionInfo.RegionHandle)
75 { 78 {
76 // Teleport within the same region 79 // Teleport within the same region
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9060bf2..8271829 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -689,6 +689,9 @@ namespace OpenSim.Region.Framework.Scenes
689 689
690 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); 690 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
691 691
692 // Reset animations; the viewer does that in teleports.
693 avatar.ResetAnimations();
694
692 if (regionHandle == m_regionInfo.RegionHandle) 695 if (regionHandle == m_regionInfo.RegionHandle)
693 { 696 {
694 m_log.DebugFormat( 697 m_log.DebugFormat(
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index fc883db..62aae2c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2472,6 +2472,11 @@ namespace OpenSim.Region.Framework.Scenes
2472 { 2472 {
2473 // Put the child agent back at the center 2473 // Put the child agent back at the center
2474 AbsolutePosition = new Vector3(128, 128, 70); 2474 AbsolutePosition = new Vector3(128, 128, 70);
2475 ResetAnimations();
2476 }
2477
2478 public void ResetAnimations()
2479 {
2475 m_animations.Clear(); 2480 m_animations.Clear();
2476 } 2481 }
2477 2482