diff options
| author | Melanie | 2012-06-26 17:35:55 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-26 17:35:55 +0100 |
| commit | 7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9 (patch) | |
| tree | 5492a786c85a7edd63fb8ad0c3c6f1da8d700741 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | When attachments are being saved and deleted for a closing root agent, delete... (diff) | |
| download | opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.zip opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.gz opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.bz2 opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 264625d..7bbb290 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -321,7 +321,7 @@ namespace OpenSim.Framework.Servers | |||
| 321 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 321 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
| 322 | 322 | ||
| 323 | m_log.InfoFormat( | 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.", | 324 | "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.", |
| 325 | timeTaken.Minutes, timeTaken.Seconds); | 325 | timeTaken.Minutes, timeTaken.Seconds); |
| 326 | } | 326 | } |
| 327 | 327 | ||