aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMW2007-11-28 12:36:09 +0000
committerMW2007-11-28 12:36:09 +0000
commitac77c50ba9efb7755bd36e832a9a93fb25946a5f (patch)
treea44c901ebd0bb80ca04beccac537d05ffb42f4b4 /OpenSim/Region/ClientStack
parent* Disambiguation in the 'sim is restarting message' that tells you 'which' si... (diff)
downloadopensim-SC_OLD-ac77c50ba9efb7755bd36e832a9a93fb25946a5f.zip
opensim-SC_OLD-ac77c50ba9efb7755bd36e832a9a93fb25946a5f.tar.gz
opensim-SC_OLD-ac77c50ba9efb7755bd36e832a9a93fb25946a5f.tar.bz2
opensim-SC_OLD-ac77c50ba9efb7755bd36e832a9a93fb25946a5f.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs10
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs1
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
467 /// <summary> 467 /// <summary>
468 /// 468 ///
469 /// </summary> 469 /// </summary>
470 public void SendTeleportCancel() 470 public void SendTeleportFailed()
471 { 471 {
472 TeleportCancelPacket tpCancel = new TeleportCancelPacket(); 472 TeleportFailedPacket tpFailed = new TeleportFailedPacket();
473 tpCancel.Info.SessionID = m_sessionId; 473 tpFailed.Info.AgentID = this.AgentId;
474 tpCancel.Info.AgentID = AgentId; 474 tpFailed.Info.Reason = Helpers.StringToField("unknown failure of teleport");
475 475
476 OutPacket(tpCancel, ThrottleOutPacketType.Task); 476 OutPacket(tpFailed, ThrottleOutPacketType.Task);
477 } 477 }
478 478
479 /// <summary> 479 /// <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
113 udpServer.LocalScene = scene; 113 udpServer.LocalScene = scene;
114 114
115 scene.LoadWorldMap(); 115 scene.LoadWorldMap();
116 scene.RegisterRegionWithGrid();
116 117
117 scene.PhysScene = GetPhysicsScene(); 118 scene.PhysScene = GetPhysicsScene();
118 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D()); 119 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());