diff options
| author | Melanie | 2013-03-15 23:45:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-15 23:45:32 +0000 |
| commit | b9146a79220c7e15ff0241fb6216028ddf15bee8 (patch) | |
| tree | 18e3342a99e448b19a1a5bb29d9579ef9d9bb817 /OpenSim/Server/Base/ServicesServerBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change the table and field names of XAssetService mysql db tables to be capit... (diff) | |
| download | opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.zip opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.gz opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.bz2 opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Server/Base/ServicesServerBase.cs')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 5aff72a..7c8e6b7 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
| @@ -186,10 +186,7 @@ namespace OpenSim.Server.Base | |||
| 186 | XmlConfigurator.Configure(); | 186 | XmlConfigurator.Configure(); |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | // FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net | 189 | LogEnvironmentInformation(); |
| 190 | // XmlConfigurator calls first accross servers. | ||
| 191 | m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory); | ||
| 192 | |||
| 193 | RegisterCommonAppenders(startupConfig); | 190 | RegisterCommonAppenders(startupConfig); |
| 194 | 191 | ||
| 195 | if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty) | 192 | if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty) |