aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d3cbe91..e544703 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1074,7 +1074,6 @@ namespace OpenSim.Region.Environment.Scenes
1074 /// <summary> 1074 /// <summary>
1075 /// Loads the World heightmap 1075 /// Loads the World heightmap
1076 /// </summary> 1076 /// </summary>
1077 ///
1078 public override void LoadWorldMap() 1077 public override void LoadWorldMap()
1079 { 1078 {
1080 try 1079 try
@@ -1095,7 +1094,7 @@ namespace OpenSim.Region.Environment.Scenes
1095 } 1094 }
1096 catch (Exception e) 1095 catch (Exception e)
1097 { 1096 {
1098 m_log.Warn("[terrain]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString()); 1097 m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString());
1099 } 1098 }
1100 } 1099 }
1101 1100
@@ -2269,6 +2268,7 @@ namespace OpenSim.Region.Environment.Scenes
2269 2268
2270 CreateAndAddScenePresence(client, child); 2269 CreateAndAddScenePresence(client, child);
2271 } 2270 }
2271
2272 m_LastLogin = System.Environment.TickCount; 2272 m_LastLogin = System.Environment.TickCount;
2273 EventManager.TriggerOnNewClient(client); 2273 EventManager.TriggerOnNewClient(client);
2274 } 2274 }