long-lost fixes to physics -- proper physical avatar management on crossings, TP

2 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 22f69a5..97a4ae1 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1063,9 +1063,9 @@ namespace OpenSim.Region.Environment.Scenes
                     // agent.startpos = new LLVector3(128, 128, 70);
                     agent.startpos = position;
                     agent.child = true;
+                    m_scenePresences[remoteClient.AgentId].Close();
                     commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
                     commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false);
-
                     AgentCircuitData circuitdata = remoteClient.RequestClientInfo();
                     string capsPath = Util.GetCapsURL(remoteClient.AgentId);
                     remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath);
@@ -1364,4 +1364,4 @@ namespace OpenSim.Region.Environment.Scenes
             base.Close();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index f594789..4d2c8e2 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -413,6 +413,7 @@ namespace OpenSim.Region.Environment.Scenes
                 m_isChildAgent = false;
 
                 //this.m_scene.SendAllSceneObjectsToClient(this.ControllingClient);
+                this.MakeAvatarPhysical(this.AbsolutePosition, false);
             }
         }