diff options
| author | Robert Adams | 2013-05-01 12:08:12 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-01 12:08:12 -0700 |
| commit | fca4e4ec7c044921ba602862c5a42900f819015a (patch) | |
| tree | f3a1e0b09b7a454009437dd9b1015891a85eadb8 /OpenSim/Server | |
| parent | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working... (diff) | |
| parent | Add in-code exaplanation for the change in cancellation signalling in STP 2.2... (diff) | |
| download | opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.zip opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.tar.gz opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.tar.bz2 opensim-SC_OLD-fca4e4ec7c044921ba602862c5a42900f819015a.tar.xz | |
Merge branch 'master' into bulletsim4
Diffstat (limited to 'OpenSim/Server')
| -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); |