Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs

1 files changed, 14 insertions, 0 deletions

diff --git a/ThirdParty/SmartThreadPool/STPStartInfo.cs b/ThirdParty/SmartThreadPool/STPStartInfo.cs
index d181563..fa9ceb4 100644
--- a/ThirdParty/SmartThreadPool/STPStartInfo.cs
+++ b/ThirdParty/SmartThreadPool/STPStartInfo.cs
@@ -33,6 +33,11 @@ namespace Amib.Threading
         private ThreadPriority _threadPriority;
 
         /// <summary>
+        /// The thread pool name. Threads will get names depending on this.
+        /// </summary>
+        private string _threadPoolName;
+
+        /// <summary>
         /// If this field is not null then the performance counters are enabled
         /// and use the string as the name of the instance.
         /// </summary>
@@ -46,6 +51,7 @@ namespace Amib.Threading
             _minWorkerThreads = SmartThreadPool.DefaultMinWorkerThreads;
             _maxWorkerThreads = SmartThreadPool.DefaultMaxWorkerThreads;
             _threadPriority = SmartThreadPool.DefaultThreadPriority;
+            _threadPoolName = SmartThreadPool.DefaultThreadPoolName;
             _pcInstanceName = SmartThreadPool.DefaultPerformanceCounterInstanceName;
             _stackSize = SmartThreadPool.DefaultStackSize;
         }
@@ -56,6 +62,7 @@ namespace Amib.Threading
             _minWorkerThreads = stpStartInfo._minWorkerThreads;
             _maxWorkerThreads = stpStartInfo._maxWorkerThreads;
             _threadPriority = stpStartInfo._threadPriority;
+            _threadPoolName = stpStartInfo._threadPoolName;
             _pcInstanceName = stpStartInfo._pcInstanceName;
             _stackSize = stpStartInfo._stackSize;
         }
@@ -84,6 +91,13 @@ namespace Amib.Threading
             set { _threadPriority = value; }
         }
 
+        public virtual string ThreadPoolName
+        {
+            get { return _threadPoolName; }
+            set { _threadPoolName = value; }
+        }
+
+
         public string PerformanceCounterInstanceName
         {
             get { return _pcInstanceName; }