Melanie
							
						 
						
							 
							
							
							
								
							
								cc4cfd9fa8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into careminster  
							
							 
							
							... 
							
							
							
							Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs 
							
						 
						
							2013-01-23 02:38:59 +00:00  
						
					 
				
					
						
							
							
								 
								Oren Hurvitz
							
						 
						
							 
							
							
							
								
							
								b77da5039e 
								
							
								 
							
						 
						
							
							
								
								Assign the SmartThreadPool name in the constructor  
							
							 
							
							... 
							
							
							
							This is required because some threads are created in the constructor, so assigning the name afterwards would be too late. 
							
						 
						
							2013-01-19 02:08:58 +00:00  
						
					 
				
					
						
							
							
								 
								Tom Grimshaw
							
						 
						
							 
							
							
							
								
							
								ae7c30a0f3 
								
							
								 
							
						 
						
							
							
								
								While examining our 10,10,10 issue I discovered that several threads were locked with each other in an unusual place; I've moved the piece of code inside a lock[] context and so far it's looking promising.  
							
							 
							
							
							
						 
						
							2010-05-18 00:07:17 -07:00  
						
					 
				
					
						
							
							
								 
								John Hurliman
							
						 
						
							 
							
							
							
								
							
								2f394b7e7e 
								
							
								 
							
						 
						
							
							
								
								* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation)  
							
							 
							
							... 
							
							
							
							* Only initialize Util's SmartThreadPool if it is actually being used
* No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads." 
							
						 
						
							2009-10-22 01:30:12 -07:00  
						
					 
				
					
						
							
							
								 
								Teravus Ovares
							
						 
						
							 
							
							
							
								
							
								1a47ff8094 
								
							
								 
							
						 
						
							
							
								
								* This is Melanie's XEngine script engine.  I've not tested this real well, however, it's confirmed to compile and OpenSimulator to run successfully without this script engine active.  
							
							 
							
							
							
						 
						
							2008-05-30 12:27:06 +00:00