diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
index 960bbefa41..c5413d2002 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
@@ -15,6 +15,15 @@ namespace OpenGrid.Framework.Communications
 
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public virtual RegionInfo LoadRegionConfigFromGridServer()
+        {
+            return null;
+        }
+
         /// <summary>
         /// 
         /// </summary>
@@ -25,7 +34,20 @@ namespace OpenGrid.Framework.Communications
             return null;
         }
 
-        public virtual bool InformNeighbourChildAgent()
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool InformNeighbourOfChildAgent()
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool AvatarCrossingToRegion()
         {
             return false;
         }
diff --git a/Common/OpenSim.Framework/IRegionCommsHost.cs b/Common/OpenSim.Framework/IRegionCommsHost.cs
index 367ecfc3b4..006661df7b 100644
--- a/Common/OpenSim.Framework/IRegionCommsHost.cs
+++ b/Common/OpenSim.Framework/IRegionCommsHost.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using OpenSim.Framework.Interfaces;
 
 namespace OpenSim.Framework
 {
@@ -8,6 +9,8 @@ namespace OpenSim.Framework
 
     public interface IRegionCommsHost
     {
-        event ExpectUserDelegate ExpectUser; 
+        event ExpectUserDelegate OnExpectUser;
+        event GenericCall2 OnExpectChildAgent;
+        event GenericCall2 OnAvatarCrossingIntoRegion;
     }
 }
diff --git a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
index b7129c5489..e2e35127ea 100644
--- a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
@@ -87,7 +87,7 @@ namespace OpenSim
 
         }
 
-        protected virtual void SetupLocalWorld()
+        protected virtual void SetupWorld()
         {
         }
 
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 95b8e1044d..7c3bca45ff 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -112,7 +112,7 @@ namespace OpenSim
             this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
             this.physManager.LoadPlugins();
 
-            this.SetupLocalWorld();
+            this.SetupWorld();
 
             m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Initialising HTTP server");
 
@@ -178,7 +178,7 @@ namespace OpenSim
             }
         }
 
-        protected override void SetupLocalWorld()
+        protected override void SetupWorld()
         {
             IGenericConfig regionConfig;
             World LocalWorld;