Melanie 0c00abcce1 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs		2012-08-03 16:46:11 +01:00
..
Agent	Fix slow loading of task inventory	2012-07-19 12:27:36 +02:00
Asset	Merge branch 'master' into careminster	2012-06-21 01:10:13 +01:00
Avatar	Merge branch 'avination' into careminster	2012-07-29 16:11:20 +01:00
Framework	Merge branch 'master' into careminster	2012-07-28 00:39:36 +01:00
Hypergrid	Revamp map block sending to eliminate overload of the grid server connection	2012-07-08 10:44:53 +02:00
InterGrid	Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework	2012-07-25 23:27:00 +01:00
LightShare	Merge branch 'master' into careminster	2012-05-27 19:24:30 +01:00
Resources	Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xml	2012-07-07 00:26:25 +01:00
Scripting	Merge branch 'master' into careminster	2012-08-03 16:46:11 +01:00
ServiceConnectorsIn	Comment out the neighbour and land in connectors from info logging that they are starting up	2012-06-20 00:42:54 +01:00
ServiceConnectorsOut	Merge branch 'master' into careminster	2012-07-28 00:39:36 +01:00
World	Merge branch 'master' into careminster	2012-08-03 16:46:11 +01:00