fix merge

2026-08-05 00:46:02 +08:00 · 2017-01-05 19:32:57 +00:00
parent 9d28fd41c6 b16abc8166
commit 254b26a7d5
960 changed files with 23754 additions and 23741 deletions
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            startInfo.ThreadPoolName = "PoolService";

            m_threadPool = new SmartThreadPool(startInfo);
-		
+
        }

        public void Start()
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                true,
                null,
                1000 * 60 * 10);
-				
+

        }