1 files changed, 7 insertions, 5 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 7628e23..c2254c4 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -203,14 +203,17 @@ namespace OpenSim.Framework.Servers.HttpServer
             m_server = pSrv;
             m_WorkerThreadCount = pWorkerThreadCount;
             m_workerThreads = new Thread[m_WorkerThreadCount];
+        }
 
+        public void Start()
+        {
             //startup worker threads
             for (uint i = 0; i < m_WorkerThreadCount; i++)
             {
                 m_workerThreads[i]
                     = Watchdog.StartThread(
                         PoolWorkerJob,
-                        String.Format("PollServiceWorkerThread{0}", i),
+                        string.Format("PollServiceWorkerThread{0}:{1}", i, m_server.Port),
                         ThreadPriority.Normal,
                         false,
                         false,
@@ -220,7 +223,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             m_retrysThread = Watchdog.StartThread(
                 this.CheckRetries,
-                "PollServiceWatcherThread",
+                string.Format("PollServiceWatcherThread:{0}", m_server.Port),
                 ThreadPriority.Normal,
                 false,
                 true,
@@ -228,7 +231,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 1000 * 60 * 10);
         }
 
-
         private void ReQueueEvent(PollServiceHttpRequest req)
         {
             if (m_running)
@@ -279,14 +281,14 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        ~PollServiceRequestManager()
+        public void Stop()
         {
             m_running = false;
 //            m_timeout = -10000; // cause all to expire
             Thread.Sleep(1000); // let the world move
 
             foreach (Thread t in m_workerThreads)
-                    Watchdog.AbortThread(t.ManagedThreadId);
+                Watchdog.AbortThread(t.ManagedThreadId);
 
             try
             {