From 9d03271265684f7724d9a242340ca6942bab3592 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 24 Jun 2010 03:43:50 +0200 Subject: And another --- OpenSim/Region/Application/OpenSimBase.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index ae942f9..27cb137 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -408,8 +408,6 @@ namespace OpenSim scene.SnmpService.BootInfo("ScriptEngine started", scene); } -======= ->>>>>>> master:OpenSim/Region/Application/OpenSimBase.cs m_sceneManager.Add(scene); if (m_autoCreateClientStack) -- cgit v1.1