2 files changed, 6 insertions, 5 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 80111d9..25d23be 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -467,13 +467,13 @@ namespace OpenSim.Region.ClientStack
         /// <summary>
         /// 
         /// </summary>
-        public void SendTeleportCancel()
+        public void SendTeleportFailed()
         {
-            TeleportCancelPacket tpCancel = new TeleportCancelPacket();
-            tpCancel.Info.SessionID = m_sessionId;
-            tpCancel.Info.AgentID = AgentId;
+            TeleportFailedPacket tpFailed = new TeleportFailedPacket();
+            tpFailed.Info.AgentID = this.AgentId;
+            tpFailed.Info.Reason = Helpers.StringToField("unknown failure of teleport");
 
-            OutPacket(tpCancel, ThrottleOutPacketType.Task);
+            OutPacket(tpFailed, ThrottleOutPacketType.Task);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index bcd845f..7445c2e 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -113,6 +113,7 @@ namespace OpenSim.Region.ClientStack
             udpServer.LocalScene = scene;
 
             scene.LoadWorldMap();
+            scene.RegisterRegionWithGrid();
 
             scene.PhysScene = GetPhysicsScene();
             scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());