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 |
|
Justin Clark-Casey (justincc)
|
5a1b6fdf06
|
Don't enable the thread watchdog until all regions are ready.
This is to avoid false positives when the machine is under heavy load whilst starting up.
|
2012-08-15 22:43:32 +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)
|
5aec0ff207
|
Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework
|
2012-07-25 23:27:00 +01:00 |
|