seems to compile ( tests comented out)

1 files changed, 3 insertions, 9 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 60702d4..09b0801 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -65,12 +65,9 @@ namespace OpenSim.Framework.Servers
         /// This will control a periodic log printout of the current 'show stats' (if they are active) for this
         /// server.
         /// </summary>
-<<<<<<< HEAD
+
         private int m_periodDiagnosticTimerMS = 60 * 60 * 1000;
         private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
-=======
-//        private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
->>>>>>> avn/ubitvar
         
         /// <summary>
         /// Random uuid for private data 
@@ -88,11 +85,8 @@ namespace OpenSim.Framework.Servers
             // Random uuid for private data
             m_osSecret = UUID.Random().ToString();
 
-<<<<<<< HEAD
-=======
-//            m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
-//            m_periodicDiagnosticsTimer.Enabled = true;
->>>>>>> avn/ubitvar
+            m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
+            m_periodicDiagnosticsTimer.Enabled = true;
         }
         
         /// <summary>