From 71e05a5707f1eaed098592dc1c3feb3389731634 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 28 Nov 2008 19:39:46 +0000 Subject: * test: Add a wodge of code in order to be able to slightly extend a test to deliver a taken object to a user inventory folder without throwing an exception * test doesn't actually double check for the presence of the item yet --- OpenSim/Region/Environment/Scenes/Scene.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs') 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 /// /// Loads the World heightmap /// - /// public override void LoadWorldMap() { try @@ -1095,7 +1094,7 @@ namespace OpenSim.Region.Environment.Scenes } catch (Exception e) { - m_log.Warn("[terrain]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString()); + m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString()); } } @@ -2269,6 +2268,7 @@ namespace OpenSim.Region.Environment.Scenes CreateAndAddScenePresence(client, child); } + m_LastLogin = System.Environment.TickCount; EventManager.TriggerOnNewClient(client); } -- cgit v1.1