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-18	1	-1/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
\| *	When reporting a thread timeout, create a copy of the info rather than ↵	Justin Clark-Casey (justincc)	2012-08-18	1	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	passing the original ThreadWatchdogInfo structure. This is to avoid the possibility of misleading reporting if a watchdog update outraces an alarm. Should address any remaining issues from http://opensimulator.org/mantis/view.php?id=6012
* \|	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	2	-12/+24
\|/ \| \| \| \| \| \| \| \| \| \| \| \|	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
*	minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is ↵	Justin Clark-Casey (justincc)	2012-07-27	1	-1/+1
\| \| \| \|	currently calculated dynamically
*	Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵	Justin Clark-Casey (justincc)	2012-07-25	2	-0/+463
\| \| \| \|	with other monitoring code from OpenSim.Framework
*	Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.	Justin Clark-Casey (justincc)	2012-07-25	7	-0/+881
	This better reflects the long-term purpose of that project and matches Monitoring modules.