fix merge

1 files changed, 13 insertions, 13 deletions

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index be4a8b4..3391240 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -167,18 +167,18 @@ namespace OpenSim.Framework.Monitoring
             }
 
             MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerThreadpool,
-                s => 
-                { 
-                    int workerThreads, iocpThreads; 
-                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                s =>
+                {
+                    int workerThreads, iocpThreads;
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
                     s.Value = workerThreads;
                 });
 
             MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerThreadpool,
-                s => 
-                { 
-                    int workerThreads, iocpThreads; 
-                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                s =>
+                {
+                    int workerThreads, iocpThreads;
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
                     s.Value = iocpThreads;
                 });
 
@@ -193,10 +193,10 @@ namespace OpenSim.Framework.Monitoring
             }
 
             MakeStat(
-                "HTTPRequestsMade", 
-                "Number of outbound HTTP requests made", 
-                "requests", 
-                ContainerNetwork, 
+                "HTTPRequestsMade",
+                "Number of outbound HTTP requests made",
+                "requests",
+                ContainerNetwork,
                 s => s.Value = WebUtil.RequestNumber,
                 MeasuresOfInterest.AverageChangeOverTime);
 
@@ -294,7 +294,7 @@ namespace OpenSim.Framework.Monitoring
                                 });
         }
 
-        // Notes on performance counters: 
+        // Notes on performance counters:
         //  "How To Read Performance Counters": http://blogs.msdn.com/b/bclteam/archive/2006/06/02/618156.aspx
         //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
         //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters