aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-20 01:06:55 +0100
committerJustin Clark-Casey (justincc)2012-06-20 01:06:55 +0100
commit4cfaa01c0a5e36f4414141a38541067460121a9b (patch)
tree819f923ee610cd9ca5c29ae5eb64e40f9d65f905
parentComment out the neighbour and land in connectors from info logging that they ... (diff)
downloadopensim-SC-4cfaa01c0a5e36f4414141a38541067460121a9b.zip
opensim-SC-4cfaa01c0a5e36f4414141a38541067460121a9b.tar.gz
opensim-SC-4cfaa01c0a5e36f4414141a38541067460121a9b.tar.bz2
opensim-SC-4cfaa01c0a5e36f4414141a38541067460121a9b.tar.xz
Remove STARTUP COMPLETE message from the startuplogo.txt file and into main logging
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs4
-rw-r--r--bin/startuplogo.txt1
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 88c3ebb..62ea9e3 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -320,7 +320,9 @@ namespace OpenSim.Framework.Servers
320 320
321 TimeSpan timeTaken = DateTime.Now - m_startuptime; 321 TimeSpan timeTaken = DateTime.Now - m_startuptime;
322 322
323// m_log.InfoFormat("[STARTUP]: Startup took {0}m {1}s", timeTaken.Minutes, timeTaken.Seconds); 323 m_log.InfoFormat(
324 "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS.",
325 timeTaken.Minutes, timeTaken.Seconds);
324 } 326 }
325 327
326 /// <summary> 328 /// <summary>
diff --git a/bin/startuplogo.txt b/bin/startuplogo.txt
index 0d11e77..e69de29 100644
--- a/bin/startuplogo.txt
+++ b/bin/startuplogo.txt
@@ -1 +0,0 @@
1STARTUP COMPLETE