diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index ff53e1a..4cbbecc 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -38,6 +38,7 @@ using log4net.Core; | |||
38 | using log4net.Repository; | 38 | using log4net.Repository; |
39 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
40 | using OpenSim.Framework.Statistics; | 40 | using OpenSim.Framework.Statistics; |
41 | using Timer=System.Timers.Timer; | ||
41 | 42 | ||
42 | namespace OpenSim.Framework.Servers | 43 | namespace OpenSim.Framework.Servers |
43 | { | 44 | { |
@@ -52,7 +53,7 @@ namespace OpenSim.Framework.Servers | |||
52 | /// This will control a periodic log printout of the current 'show stats' (if they are active) for this | 53 | /// This will control a periodic log printout of the current 'show stats' (if they are active) for this |
53 | /// server. | 54 | /// server. |
54 | /// </summary> | 55 | /// </summary> |
55 | private System.Timers.Timer m_periodicDiagnosticsTimer = new System.Timers.Timer(60 * 60 * 1000); | 56 | private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); |
56 | 57 | ||
57 | protected ConsoleBase m_console; | 58 | protected ConsoleBase m_console; |
58 | 59 | ||
@@ -266,7 +267,7 @@ namespace OpenSim.Framework.Servers | |||
266 | 267 | ||
267 | // If there is no threshold set then the threshold is effectively everything. | 268 | // If there is no threshold set then the threshold is effectively everything. |
268 | Level thresholdLevel | 269 | Level thresholdLevel |
269 | = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All); | 270 | = (null != consoleAppender.Threshold ? consoleAppender.Threshold : Level.All); |
270 | 271 | ||
271 | Notice(String.Format("Console log level is {0}", thresholdLevel)); | 272 | Notice(String.Format("Console log level is {0}", thresholdLevel)); |
272 | } | 273 | } |