diff options
| author | Melanie | 2013-04-30 23:45:38 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-30 23:45:38 +0100 |
| commit | b89d18e6f4a1099fe031ebf10776a752826604b9 (patch) | |
| tree | b964e6b167e156dc2adeddeb733d93eac342e9c0 /OpenSim/Server/Base | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fix error messages created while an avatar has no initial (diff) | |
| download | opensim-SC_OLD-b89d18e6f4a1099fe031ebf10776a752826604b9.zip opensim-SC_OLD-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.gz opensim-SC_OLD-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.bz2 opensim-SC_OLD-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Server/Base')
| -rw-r--r-- | OpenSim/Server/Base/ServicesServerBase.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 7c8e6b7..b13c87d 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs | |||
| @@ -171,11 +171,6 @@ namespace OpenSim.Server.Base | |||
| 171 | 171 | ||
| 172 | m_console = MainConsole.Instance; | 172 | m_console = MainConsole.Instance; |
| 173 | 173 | ||
| 174 | // Configure the appenders for log4net | ||
| 175 | // | ||
| 176 | OpenSimAppender consoleAppender = null; | ||
| 177 | FileAppender fileAppender = null; | ||
| 178 | |||
| 179 | if (logConfig != null) | 174 | if (logConfig != null) |
| 180 | { | 175 | { |
| 181 | FileInfo cfg = new FileInfo(logConfig); | 176 | FileInfo cfg = new FileInfo(logConfig); |