From 3f25128e77af2a53e765436454b8fddeb8f88894 Mon Sep 17 00:00:00 2001
From: diva
Date: Wed, 18 Feb 2009 01:49:18 +0000
Subject: Adds support for preserving animations on region crossings and TPs.
 Known issue: after TP, the self client doesn't see the animations going, but
 others can see them. So there's a bug there (TPs only, crossings seem to be
 all fine). Untested: did not test animation overriders; only tested playing
 animations from the viewer.

---
 OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 4c10e2c..d0156e1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -904,6 +904,10 @@ namespace OpenSim.Region.Framework.Scenes
                             avatar.Close();
                             CloseConnection(avatar.UUID);
                         }
+                        else
+                            // now we have a child agent in this region. 
+                            avatar.Reset();
+
 
                         // if (teleport success) // seems to be always success here
                         // the user may change their profile information in other region,
@@ -1180,8 +1184,7 @@ namespace OpenSim.Region.Framework.Scenes
             // If the cross was successful, this agent is a child agent
             if (agent.IsChildAgent)
             {
-                // Put the child agent back at the center
-                agent.AbsolutePosition = new Vector3(128, 128, 70);
+                agent.Reset();
             }
             else // Not successful
             {
-- 
cgit v1.1