aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-09-21 17:59:44 +0100
committerUbitUmarov2015-09-21 17:59:44 +0100
commitc7b1d52e2919e22d7e4e1c23f12900f423697a31 (patch)
tree35a03d0a0039c06645994d108c57fbf4b69aa9d1
parentFix a regression to GetSittingAvatars(). Return List<ScenePresence> once more. (diff)
downloadopensim-SC-c7b1d52e2919e22d7e4e1c23f12900f423697a31.zip
opensim-SC-c7b1d52e2919e22d7e4e1c23f12900f423697a31.tar.gz
opensim-SC-c7b1d52e2919e22d7e4e1c23f12900f423697a31.tar.bz2
opensim-SC-c7b1d52e2919e22d7e4e1c23f12900f423697a31.tar.xz
remove duplicated and breaking code
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index c533a2e..3426d10 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -84,9 +84,6 @@ namespace OpenSim.Framework.Servers
84 { 84 {
85 // Random uuid for private data 85 // Random uuid for private data
86 m_osSecret = UUID.Random().ToString(); 86 m_osSecret = UUID.Random().ToString();
87
88 m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
89 m_periodicDiagnosticsTimer.Enabled = true;
90 } 87 }
91 88
92 /// <summary> 89 /// <summary>