aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
1 files changed, 0 insertions, 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
408 scene.SnmpService.BootInfo("ScriptEngine started", scene); 408 scene.SnmpService.BootInfo("ScriptEngine started", scene);
409 } 409 }
410 410
411=======
412>>>>>>> master:OpenSim/Region/Application/OpenSimBase.cs
413 m_sceneManager.Add(scene); 411 m_sceneManager.Add(scene);
414 412
415 if (m_autoCreateClientStack) 413 if (m_autoCreateClientStack)