Melanie 68b910c1ff Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs

2013-03-22 01:01:24 +00: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

Make StatsManager default output a little more readable

2013-02-24 07:48:01 -08: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-02-22 01:28:54 +00:00

MemoryWatchdog.cs

revert accidental change to MemoryWatchdog stat calculation in previous b1b4687

2013-01-10 01:30:00 +00:00

SimExtraStatsCollector.cs

For the moment, disable the output of the 'scene' statistics in SimExtraStatsCollector

2013-03-19 12:37:44 -07:00

StatsManager.cs

Modify StatsManager so console command "show stats category container"

2013-02-24 07:48:00 -08: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

2012-11-17 02:03:24 +00:00