diff options
| author | Melanie | 2012-06-21 01:10:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-21 01:10:13 +0100 |
| commit | eab211f94d33f9c77a63344072a79cb66707c0ff (patch) | |
| tree | 4ec906bf15a6738a1a2443ccc23f83c85ef3fa0b /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instea... (diff) | |
| download | opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.zip opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.gz opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.bz2 opensim-SC-eab211f94d33f9c77a63344072a79cb66707c0ff.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 87d04f8..264625d 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> |