aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-12-14 02:23:12 +0000
committerJustin Clark-Casey (justincc)2013-12-14 02:23:12 +0000
commitee163b5751f367866bc7370faf265fd30be3729e (patch)
tree8b8ac21bed7696b69a63623c686a8c5f440269b4 /OpenSim/Framework
parentMerge branch 'justincc-master' (diff)
parentWrap analysis of the particle system in the UUID Gatherer in a separate try/c... (diff)
downloadopensim-SC_OLD-ee163b5751f367866bc7370faf265fd30be3729e.zip
opensim-SC_OLD-ee163b5751f367866bc7370faf265fd30be3729e.tar.gz
opensim-SC_OLD-ee163b5751f367866bc7370faf265fd30be3729e.tar.bz2
opensim-SC_OLD-ee163b5751f367866bc7370faf265fd30be3729e.tar.xz
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs4
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