TEST move parcelRegionCross to EntityTransferModule cross so it works on

sitting avatars. (may be bad) comented out sending root avatars
information to the child that was just a root it should have it all
already. Dont turn a sitting avatar physical,  that needs to be a stand at SOG

2 files changed, 14 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index d6d86b9..af26998 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1529,7 +1529,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, agent.AbsolutePosition, out x, out y, out version, out newpos);
             if (neighbourRegion == null)
             {
-                agent.ControllingClient.SendAlertMessage("Cannot region cross into banned parcel");
+                agent.ControllingClient.SendAlertMessage("Cannot region cross into void");
                 return false;
             }
 
@@ -1680,7 +1680,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         neighbourRegion.RegionName, agent.Name);
 
                     ReInstantiateScripts(agent);
-                    agent.AddToPhysicalScene(isFlying);
+                    if(agent.ParentID == 0 && agent.ParentUUID == UUID.Zero)
+                        agent.AddToPhysicalScene(isFlying);
 
                     return false;
                 }
@@ -1749,8 +1750,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
 
             // now we have a child agent in this region. Request all interesting data about other (root) agents
-            agent.SendOtherAgentsAvatarDataToMe();
-            agent.SendOtherAgentsAppearanceToMe();
+
+            // why do that? we either where a root having all that or we are leaving the area
+
+//            agent.SendOtherAgentsAvatarDataToMe();
+//            agent.SendOtherAgentsAppearanceToMe();
+
+            agent.parcelRegionCross(false);
 
             // Backwards compatibility. Best effort
             if (version == "Unknown" || version == string.Empty)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5acd51e..d65c250 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3863,7 +3863,7 @@ namespace OpenSim.Region.Framework.Scenes
         protected bool CrossToNewRegion()
         {
             bool result = false;
-            parcelRegionCross(false);
+//            parcelRegionCross(false);
             try
             {
                 result = m_scene.CrossAgentToNewRegion(this, Flying);
@@ -3872,8 +3872,8 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 result = m_scene.CrossAgentToNewRegion(this, false);
             }
-            if(!result)
-                parcelRegionCross(true);
+ //           if(!result)
+ //               parcelRegionCross(true);
 
             return result;
 
@@ -5531,7 +5531,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        private void parcelRegionCross(bool abort)
+        public void parcelRegionCross(bool abort)
         {
             if (!ParcelHideThisAvatar)
                 return;