Melanie 90ad98370a Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-08-16 02:46:48 +01:00
..
Interfaces	Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.	2012-07-25 23:11:50 +01:00
AssetStatsCollector.cs	Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.	2012-07-25 23:11:50 +01:00
BaseStatsCollector.cs	Merge branch 'master' into careminster	2012-07-28 00:39:36 +01:00
MemoryWatchdog.cs	minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is currently calculated dynamically	2012-07-27 22:20:43 +01:00
SimExtraStatsCollector.cs	Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.	2012-07-25 23:11:50 +01:00
StatsManager.cs	Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.	2012-07-25 23:11:50 +01:00
UserStatsCollector.cs	Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.	2012-07-25 23:11:50 +01:00
Watchdog.cs	Merge branch 'master' into careminster	2012-08-16 02:46:48 +01:00