And another

avinationmerge
Melanie Thielker 2010-06-24 03:43:50 +02:00
parent e94cf3d9b7
commit 9d03271265
1 changed files with 0 additions and 2 deletions

View File

@ -408,8 +408,6 @@ namespace OpenSim
scene.SnmpService.BootInfo("ScriptEngine started", scene); scene.SnmpService.BootInfo("ScriptEngine started", scene);
} }
=======
>>>>>>> master:OpenSim/Region/Application/OpenSimBase.cs
m_sceneManager.Add(scene); m_sceneManager.Add(scene);
if (m_autoCreateClientStack) if (m_autoCreateClientStack)