Melanie 96539ffc79 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2011-12-08 18:29:19 +00:00

..

IRCClientView.cs

Merge branch 'master' into bigmerge

2011-12-08 18:29:19 +00:00

IRCServer.cs

Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated

2009-10-22 12:33:23 -07:00