Melanie
|
39cbf4f7a1
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
|
2012-10-17 00:12:30 +01:00 |
|
Justin Clark-Casey (justincc)
|
4e5b2346a5
|
Add LastMemoryChurn stat using existing data so we can more quickly tell how memory churn changes rather than waiting for the average to move.
|
2012-10-16 23:44:52 +01:00 |
|
Melanie
|
771d79e83e
|
Merge branch 'master' into careminster
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
|
2012-07-28 00:39:36 +01:00 |
|
Justin Clark-Casey (justincc)
|
35efa88c26
|
Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.
This better reflects the long-term purpose of that project and matches Monitoring modules.
|
2012-07-25 23:11:50 +01:00 |
|