diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index ea30b9af6c..d9965b6a64 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -60,12 +60,13 @@ namespace OpenSim.Framework.Servers.HttpServer
                 m_PollServiceWorkerThreads[i] = new PollServiceWorkerThread(m_server, pTimeout);
                 m_PollServiceWorkerThreads[i].ReQueue += ReQueueEvent;
 
-//                m_workerThreads[i]
-//                    = Watchdog.StartThread(
-//                        m_PollServiceWorkerThreads[i].ThreadStart,
-//                        String.Format("PollServiceWorkerThread{0}", i),
-//                        ThreadPriority.Normal,
-//                        false);
+                m_workerThreads[i]
+                    = Watchdog.StartThread(
+                        m_PollServiceWorkerThreads[i].ThreadStart,
+                        String.Format("PollServiceWorkerThread{0}", i),
+                        ThreadPriority.Normal,
+                        false,
+                        int.MaxValue);
             }
 
             m_watcherThread
@@ -73,7 +74,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                     this.ThreadStart,
                     "PollServiceWatcherThread",
                     ThreadPriority.Normal,
-                    false);
+                    false,
+                    1000 * 60 * 10);
         }
 
         internal void ReQueueEvent(PollServiceHttpRequest req)
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs
index 1374518b6e..5ffa8909e6 100644
--- a/OpenSim/Framework/Watchdog.cs
+++ b/OpenSim/Framework/Watchdog.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework
             public int LastTick { get; set; }
 
             /// <summary>
-            /// Number of seconds before we notify that the thread is having a problem.
+            /// Number of milliseconds before we notify that the thread is having a problem.
             /// </summary>
             public int Timeout { get; set; }
 
@@ -116,7 +116,7 @@ namespace OpenSim.Framework
         /// <param name="isBackground">True to run this thread as a background
         /// thread, otherwise false</param>
         /// <param name="timeout">
-        /// Number of seconds to wait until we issue a warning about timeout.
+        /// Number of milliseconds to wait until we issue a warning about timeout.
         /// </para>
         /// <returns>The newly created Thread object</returns>
         public static Thread StartThread(