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

Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-02-04 11:48:20 +00:00

..

IRCClientView.cs

Merge branch 'master' into careminster

2012-02-04 11:48:20 +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