* Added a child agent check to the ChildAgentData Update to make sure that you're a child agent before applying the changes from the grid comms. Doing this to rule it out as a source of a few bugs such as the Zombie bug and the Express Train to 0,0,0 bug.

1 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index dfefe24..6a22ddb 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1754,6 +1754,9 @@ namespace OpenSim.Region.Environment.Scenes
         public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
         {
             //
+            if (!IsChildAgent)
+                return;
+
             int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize;
             int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize;
 
@@ -1766,7 +1769,8 @@ namespace OpenSim.Region.Environment.Scenes
 
 
             m_godlevel = cAgentData.godlevel;
-            SetHeight(cAgentData.AVHeight);
+            m_avHeight = cAgentData.AVHeight;
+            //SetHeight(cAgentData.AVHeight);
 
             ControllingClient.SetChildAgentThrottle(cAgentData.throttles);