opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster	Melanie	2012-08-16	1	-5/+26
\|\ \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| *	Don't enable the thread watchdog until all regions are ready.	Justin Clark-Casey (justincc)	2012-08-15	1	-5/+26
\| \| \| \| \| \| \| \|	This is to avoid false positives when the machine is under heavy load whilst starting up.
* \|	Merge branch 'master' into careminster	Melanie	2012-07-28	1	-1/+1
\|/ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
*	Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵	Justin Clark-Casey (justincc)	2012-07-25	1	-0/+334
	with other monitoring code from OpenSim.Framework