From ac77c50ba9efb7755bd36e832a9a93fb25946a5f Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 28 Nov 2007 12:36:09 +0000
Subject: Moved the m_sceneGridService.RegisterRegion(RegionInfo); call out of
 LoadWorldMap and into its own public method (which is called during region
 creation). We shouldn't have things like that in methods like LoadWorldMap as
 some regions might not being having a worldmap loaded via the LoadWorldMap
 method (like in custom applications). Deleted the CreateTerrainTextureInitial
 Method which was a 99% duplicate of CreateTerrainTexture, with just a bool
 field setting difference. That bool is now passed to CreateTerrainTexture as
 a param.

---
 OpenSim/Region/ClientStack/ClientView.API.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/ClientStack/ClientView.API.cs')

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>
-- 
cgit v1.1