diff options
author | Melanie | 2010-10-06 00:27:10 +0100 |
---|---|---|
committer | Melanie | 2010-10-06 00:27:10 +0100 |
commit | d8149373c15d9ec39c0f836a337e58b633f45829 (patch) | |
tree | 3678027b5eb7f1cdfb29b1c0c80bd0c3d7a62ae6 /OpenSim/Server/Base/ServicesServerBase.cs | |
parent | Avoid throwing errors when adding existing meshes to the render scene (diff) | |
parent | Remove sirikata project (diff) | |
download | opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.zip opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.gz opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.bz2 opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 18f0f24..2652ff2 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
@@ -176,7 +176,7 @@ namespace OpenSim.Server.Base | |||
176 | OpenSimAppender consoleAppender = null; | 176 | OpenSimAppender consoleAppender = null; |
177 | FileAppender fileAppender = null; | 177 | FileAppender fileAppender = null; |
178 | 178 | ||
179 | if ( logConfig != null ) | 179 | if (logConfig != null) |
180 | { | 180 | { |
181 | FileInfo cfg = new FileInfo(logConfig); | 181 | FileInfo cfg = new FileInfo(logConfig); |
182 | XmlConfigurator.Configure(cfg); | 182 | XmlConfigurator.Configure(cfg); |