diff options
| author | UbitUmarov | 2015-09-08 15:03:22 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-08 15:03:22 +0100 |
| commit | 5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch) | |
| tree | 03077685e44648264523e1851cd068d51a507e81 /OpenSim/Region/Application/OpenSimBackground.cs | |
| parent | add script events per sec stat, using the time report code, but ignoring the... (diff) | |
| parent | More 'everything is a module' merging. (diff) | |
| download | opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2 opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz | |
Merge branch 'mbworknew1' into ubitworkvarnew
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBackground.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBackground.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBackground.cs b/OpenSim/Region/Application/OpenSimBackground.cs index 008c6b0..15d9065 100644 --- a/OpenSim/Region/Application/OpenSimBackground.cs +++ b/OpenSim/Region/Application/OpenSimBackground.cs | |||
| @@ -55,7 +55,7 @@ namespace OpenSim | |||
| 55 | base.Startup(); | 55 | base.Startup(); |
| 56 | 56 | ||
| 57 | m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}", | 57 | m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}", |
| 58 | m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : ""); | 58 | SceneManager.Scenes.Count, SceneManager.Scenes.Count > 1 ? "s" : ""); |
| 59 | 59 | ||
| 60 | WorldHasComeToAnEnd.WaitOne(); | 60 | WorldHasComeToAnEnd.WaitOne(); |
| 61 | WorldHasComeToAnEnd.Close(); | 61 | WorldHasComeToAnEnd.Close(); |