diff options
| author | Melanie | 2014-01-05 20:12:32 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-05 20:12:32 +0000 |
| commit | e79fab91dbe731e9d177de61993d963bcc067299 (patch) | |
| tree | 4358fd508e55dd91774ba83b8e4c30fc24f452c7 /OpenSim/Framework/Servers | |
| parent | Merge commit '92aad6f1bb45974927fa43d6fd30f98337dee3f0' into careminster (diff) | |
| parent | Some missing definitions needed for successful compilation. (diff) | |
| download | opensim-SC_OLD-e79fab91dbe731e9d177de61993d963bcc067299.zip opensim-SC_OLD-e79fab91dbe731e9d177de61993d963bcc067299.tar.gz opensim-SC_OLD-e79fab91dbe731e9d177de61993d963bcc067299.tar.bz2 opensim-SC_OLD-e79fab91dbe731e9d177de61993d963bcc067299.tar.xz | |
Intermediate commit. Sill errors.
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
| -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 bfd67c7..cbd34a2 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -145,8 +145,8 @@ namespace OpenSim.Framework.Servers | |||
| 145 | 145 | ||
| 146 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 146 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
| 147 | 147 | ||
| 148 | m_log.InfoFormat( | 148 | MainConsole.Instance.OutputFormat( |
| 149 | "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.", | 149 | "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.", |
| 150 | timeTaken.Minutes, timeTaken.Seconds); | 150 | timeTaken.Minutes, timeTaken.Seconds); |
| 151 | } | 151 | } |
| 152 | 152 | ||