diff options
| author | BlueWall | 2013-03-05 15:30:54 -0500 |
|---|---|---|
| committer | BlueWall | 2013-03-05 15:30:54 -0500 |
| commit | f676408e2a45101bcab0a33f598ea9047f02036a (patch) | |
| tree | eb34ea8fb0a783ee466873462285eba629ab6405 /OpenSim/Server/Base/ServicesServerBase.cs | |
| parent | Add method to remove JsonRpc Handlers from the server (diff) | |
| parent | * Add a Max Payload size property to the Websocket Server Handler. If you ... (diff) | |
| download | opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.zip opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.gz opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.bz2 opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index ecd69b0..5aff72a 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
| @@ -186,6 +186,10 @@ 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 | ||
| 190 | // XmlConfigurator calls first accross servers. | ||
| 191 | m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory); | ||
| 192 | |||
| 189 | RegisterCommonAppenders(startupConfig); | 193 | RegisterCommonAppenders(startupConfig); |
| 190 | 194 | ||
| 191 | if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty) | 195 | if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty) |