aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
diff options
context:
space:
mode:
authorMelanie2009-11-18 06:20:21 +0000
committerMelanie2009-11-18 06:20:21 +0000
commit5d0778014df68b48abb08c8f63204cf7e077af7f (patch)
tree5f6ef28958950412130f68fa3bbe1491a456eef7 /OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
parentMerge branch 'master' into careminster (diff)
parentChange PresenceData to PresenceInfo to remove a naming conflict in the (diff)
downloadopensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.zip
opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.gz
opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.bz2
opensim-SC-5d0778014df68b48abb08c8f63204cf7e077af7f.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index d7e62a8..0f9c190 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
82 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); 82 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
83 83
84 // Reset animations; the viewer does that in teleports. 84 // Reset animations; the viewer does that in teleports.
85 avatar.ResetAnimations(); 85 avatar.Animator.ResetAnimations();
86 86
87 if (regionHandle == m_regionInfo.RegionHandle) 87 if (regionHandle == m_regionInfo.RegionHandle)
88 { 88 {