2 files changed, 9 insertions, 10 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index d63ac2e..9b0d7ea 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using System.Timers;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
@@ -115,11 +114,11 @@ namespace OpenSim.Grid.GridServer
 
         protected virtual void LoadPlugins()
         {
-            PluginLoader<IGridPlugin> loader =
-                new PluginLoader<IGridPlugin>(new GridPluginInitialiser(this));
-
-            loader.Load("/OpenSim/GridServer");
-            m_plugins = loader.Plugins;
+            using (PluginLoader<IGridPlugin> loader = new PluginLoader<IGridPlugin>(new GridPluginInitialiser(this)))
+            {
+                loader.Load("/OpenSim/GridServer");
+                m_plugins = loader.Plugins;
+            }
         }
 
         public override void ShutdownSpecific()
diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
index 8ce353c..f24cef6 100644
--- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs
@@ -78,8 +78,6 @@ namespace OpenSim.Grid.UserServer.Modules
         private OpenSim.Framework.BlockingQueue<PresenceNotification> m_NotifyQueue =
                 new OpenSim.Framework.BlockingQueue<PresenceNotification>();
 
-        Thread m_NotifyThread;
-
         private IGridServiceCore m_core;
 
         public event AgentLocationDelegate OnAgentLocation;
@@ -96,8 +94,8 @@ namespace OpenSim.Grid.UserServer.Modules
         {
             m_core = core;
             m_core.RegisterInterface<MessageServersConnector>(this);
-            m_NotifyThread = new Thread(new ThreadStart(NotifyQueueRunner));
-            m_NotifyThread.Start();
+
+            Watchdog.StartThread(NotifyQueueRunner, "NotifyQueueRunner", ThreadPriority.Normal, true);
         }
 
         public void PostInitialise()
@@ -427,6 +425,8 @@ namespace OpenSim.Grid.UserServer.Modules
                 {
                     TellMessageServersAboutUserLogoffInternal(presence.agentID);
                 }
+
+                Watchdog.UpdateThread();
             }
         }