1 files changed, 34 insertions, 0 deletions

diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index 98f5027..2500ee6 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -580,6 +580,7 @@ namespace OpenSim.Region.Scenes
                     agent.BaseFolder = LLUUID.Zero;

                     agent.InventoryFolder = LLUUID.Zero;

                     agent.startpos = new LLVector3(128, 128, 70);

+                    agent.child = true;

                     this.commsManager.InterSims.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);

                     remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);

                 }

@@ -589,6 +590,27 @@ namespace OpenSim.Region.Scenes
         /// <summary>

         /// 

         /// </summary>

+        /// <param name="regionHandle"></param>

+        /// <returns></returns>

+        public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)

+        {

+            return this.commsManager.GridServer.RequestNeighbourInfo(regionHandle);

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

+        /// <param name="regionhandle"></param>

+        /// <param name="agentID"></param>

+        /// <param name="position"></param>

+        public void InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position)

+        {

+            this.commsManager.InterSims.ExpectAvatarCrossing(regionhandle, agentID, position);

+        }

+

+        /// <summary>

+        /// 

+        /// </summary>

         /// <param name="agentID"></param>

         public override void RemoveAvatar(LLUUID agentID)

         {

@@ -678,6 +700,7 @@ namespace OpenSim.Region.Scenes
             if (this.regionCommsHost != null)

             {

                 this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);

+                this.regionCommsHost.OnAvatarCrossingIntoRegion += new AgentCrossing(this.AgentCrossing);

             }

         }

 

@@ -696,6 +719,17 @@ namespace OpenSim.Region.Scenes
             }

         }

 

+        public void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        {

+            if (regionHandle == this.m_regInfo.RegionHandle)

+            {

+                if (this.Avatars.ContainsKey(agentID))

+                {

+                    this.Avatars[agentID].Pos = position;

+                }

+            }

+        }

+

         #endregion

 

         /// <summary>