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/Examples/SimpleApp/MyNpcCharacter.cs | 2 +-
 OpenSim/Region/Examples/SimpleApp/MyWorld.cs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Examples/SimpleApp')

diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index 550b232..56316e6 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -255,7 +255,7 @@ namespace SimpleApp
         {
         }
 
-        public virtual void SendTeleportCancel()
+        public virtual void SendTeleportFailed()
         {
         }
 
diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 389ba47..535d519 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -63,7 +63,7 @@ namespace SimpleApp
             }
 
             Terrain.GetHeights1D(map);
-            CreateTerrainTexture();
+            CreateTerrainTexture(true);
         }
 
         public override void AddNewClient(IClientAPI client, bool child)
-- 
cgit v1.1