diff options
| author | Melanie Thielker | 2010-06-24 03:43:50 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-06-24 03:43:50 +0200 |
| commit | 9d03271265684f7724d9a242340ca6942bab3592 (patch) | |
| tree | 028c49518a0fb4a2070b66453aafd1060737d52e /OpenSim | |
| parent | And another conflict (diff) | |
| download | opensim-SC-9d03271265684f7724d9a242340ca6942bab3592.zip opensim-SC-9d03271265684f7724d9a242340ca6942bab3592.tar.gz opensim-SC-9d03271265684f7724d9a242340ca6942bab3592.tar.bz2 opensim-SC-9d03271265684f7724d9a242340ca6942bab3592.tar.xz | |
And another
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
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) |