Melanie 2f41bc4ca7 Fix merge issues		2010-09-14 22:14:08 +01:00
..
ApplicationPlugins	Merge branch 'master' into careminster-presence-refactor	2010-09-13 16:17:38 +01:00
Client	Merge branch 'master' into careminster-presence-refactor	2010-09-05 15:06:00 +01:00
ConsoleClient	Make the text mode remote console really work. It can now be used to send	2010-06-08 22:05:06 +01:00
Data	Merge branch 'master' into careminster-presence-refactor	2010-09-13 16:17:38 +01:00
Framework	Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog	2010-09-14 22:24:11 +01:00
Region	Fix merge issues	2010-09-14 22:14:08 +01:00
Server	Merge branch 'master' into careminster-presence-refactor	2010-09-13 16:17:38 +01:00
Services	Merge branch 'master' into careminster-presence-refactor	2010-09-13 16:17:38 +01:00
TestSuite	* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll	2009-10-30 00:08:41 -07:00
Tests	Merge branch 'master' into careminster-presence-refactor	2010-09-14 22:03:42 +01:00
Tools	remove ancient and unused OpenSim.GridLaunch GUI code.	2010-08-19 01:11:10 +01:00