Melanie c256447f46 Merge branch 'avination' into careminster ... Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs		2012-07-16 22:22:42 +01:00
..
Agent	Record the fact that child agents can have asset transactions.	2012-06-07 23:51:04 +01:00
Asset	Merge branch 'master' into careminster	2012-06-21 01:10:13 +01:00
Avatar	Merge branch 'master' into careminster	2012-07-12 08:55:16 +01:00
Framework	Merge branch 'master' into careminster	2012-06-28 03:21:08 +01:00
Hypergrid	Revamp map block sending to eliminate overload of the grid server connection	2012-07-08 10:44:53 +02:00
InterGrid	Stop spurious scene loop startup timeout alarms for scenes with many prims.	2012-02-24 05:02:33 +00: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 'avination' into careminster	2012-07-16 22:22:42 +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-13 02:27:16 +01:00
World	Merge branch 'master' into careminster	2012-07-16 21:32:10 +01:00