diff options
| author | Melanie | 2013-12-16 22:11:03 +0000 |
|---|---|---|
| committer | Melanie | 2013-12-16 22:11:03 +0000 |
| commit | fe01e7d1cce9d875b5989931b9652e4cd00c311d (patch) | |
| tree | d7e12171d5952d5a96c3f405a5d80c6eebb00937 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | This is the acutal sitting avatar crossing code. This commit implements the (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC_OLD-fe01e7d1cce9d875b5989931b9652e4cd00c311d.zip opensim-SC_OLD-fe01e7d1cce9d875b5989931b9652e4cd00c311d.tar.gz opensim-SC_OLD-fe01e7d1cce9d875b5989931b9652e4cd00c311d.tar.bz2 opensim-SC_OLD-fe01e7d1cce9d875b5989931b9652e4cd00c311d.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 4ab6908..566772d 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -135,8 +135,8 @@ namespace OpenSim.Framework.Servers | |||
| 135 | 135 | ||
| 136 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 136 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
| 137 | 137 | ||
| 138 | m_log.InfoFormat( | 138 | MainConsole.Instance.OutputFormat( |
| 139 | "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.", | 139 | "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.", |
| 140 | timeTaken.Minutes, timeTaken.Seconds); | 140 | timeTaken.Minutes, timeTaken.Seconds); |
| 141 | } | 141 | } |
| 142 | 142 | ||