Melanie bef03fb30b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs

2013-08-17 03:23:45 +01:00

..

Checks

Add checks monitoring framework to provide alerts if certain conditions do not hold.

2013-08-05 19:22:47 +01:00

Interfaces

Add a method to IStatsCollector for returning stats as an OSDMap.

2013-02-20 16:13:51 -08:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Stats

Stats treaking. Update ToOSDMap for Stat and PercentageStat to return

2013-08-10 09:09:52 -07:00

AssetStatsCollector.cs

Add a method to IStatsCollector for returning stats as an OSDMap.

2013-02-20 16:13:51 -08:00

BaseStatsCollector.cs

Merge branch 'master' into careminster

2013-06-23 01:59:57 +01:00

ChecksManager.cs

Add checks monitoring framework to provide alerts if certain conditions do not hold.

2013-08-05 19:22:47 +01:00

MemoryWatchdog.cs

minor: Change "memory churn" terminology in statistics to "heap allocation rate" since this is more generally meaningful

2013-06-20 00:32:12 +01:00

ServerStatsCollector.cs

Change "ObjectMemory" stat to "HeapMemory" to align with other stat names. Also round this and ProcessMemory to three decimal places in common with other memory stats.

2013-06-20 00:52:39 +01:00

SimExtraStatsCollector.cs

Make "abnormal thread terminations" into "ClientLogoutsDueToNoReceives" and add this to the StatsManager

2013-07-29 23:18:29 +01:00

StatsLogger.cs

Add file missing from last commit 4c2f6de

2013-08-06 18:32:16 +01:00

StatsManager.cs

minor: remove mono compiler warning in StatsManager

2013-08-17 00:51:21 +01:00

UserStatsCollector.cs

Add a method to IStatsCollector for returning stats as an OSDMap.

2013-02-20 16:13:51 -08:00

Watchdog.cs

Merge branch 'master' into careminster

2013-08-07 23:29:42 +01:00