From 52c5b7517404fada9cc8969de20810d54cfa2009 Mon Sep 17 00:00:00 2001
From: diva
Date: Sun, 15 Feb 2009 05:50:07 +0000
Subject: Moving SendInitialData sort of back to where it was before, so that
 it doesn't interfere with the unit tests.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a93fcb2..69397eb 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -845,7 +845,8 @@ namespace OpenSim.Region.Framework.Scenes
             AbsolutePosition = pos;
 
             AddToPhysicalScene(isFlying);
-            SetHeight(m_appearance.AvatarHeight);
+            if (m_appearance != null)
+                SetHeight(m_appearance.AvatarHeight);
             
             // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 
             // avatar to return to the standing position in mid-air.  On login it looks like this is being sent
@@ -866,8 +867,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_isChildAgent = false;
 
-            SendInitialData();
-
             m_scene.EventManager.TriggerOnMakeRootAgent(this);
 
         }
@@ -1036,12 +1035,14 @@ namespace OpenSim.Region.Framework.Scenes
                     Scene.SendReleaseAgent(m_rootRegionHandle, UUID, m_callbackURI);
                     m_callbackURI = null;
                 }
-                
+
                 //m_log.DebugFormat("Completed movement");
             }
 
             m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look);
 
+            SendInitialData();
+
         }
 
         /// <summary>
-- 
cgit v1.1