opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster	Melanie	2013-06-23	1	-7/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
\| *	minor: Change "memory churn" terminology in statistics to "heap allocation ↵	Justin Clark-Casey (justincc)	2013-06-20	1	-6/+6
\| \| \| \| \| \| \| \|	rate" since this is more generally meaningful
* \|	Merge branch 'master' into careminster	Melanie	2013-02-22	1	-0/+7
\|\ \ \| \|/
\| *	Add a method to IStatsCollector for returning stats as an OSDMap.	Robert Adams	2013-02-20	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format).
* \|	Merge branch 'master' into careminster	Melanie	2012-10-17	1	-9/+14
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs
\| *	Add LastMemoryChurn stat using existing data so we can more quickly tell how ↵	Justin Clark-Casey (justincc)	2012-10-16	1	-1/+5
\| \| \| \| \| \| \| \|	memory churn changes rather than waiting for the average to move.
* \|	Merge branch 'master' into careminster	Melanie	2012-07-28	1	-11/+23
\|/ \| \| \| \| \| \| \| \| \| \| \| \|	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
*	Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.	Justin Clark-Casey (justincc)	2012-07-25	1	-0/+67
	This better reflects the long-term purpose of that project and matches Monitoring modules.