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
..
BasicPhysicsPlugin	Remove some mono compiler warnings	2012-06-30 01:25:39 +01:00
BulletSPlugin	Clean up collision reporting code so they are properly passed to	2012-07-06 15:09:19 -07:00
ChOdePlugin	fix chODE loosing some part positions when doing isPhysical false	2012-04-24 23:13:57 +01:00
ConvexDecompositionDotNet	BulletSim initial checkin	2011-06-20 17:24:42 -07:00
Manager	Merge branch 'master' into careminster	2012-05-31 03:35:24 +01:00
Meshing	Merge branch 'master' into careminster	2012-07-16 21:32:10 +01:00
OdePlugin	Merge branch 'master' into careminster	2012-06-29 22:24:53 +01:00
POSPlugin	Merge branch 'master' into careminster	2011-12-22 16:37:25 +00:00
UbitMeshing	Downgrade an error log message to info because there is nothing we can do if	2012-04-16 17:32:30 +02:00
UbitOdePlugin	Reinstate sleeping because less CPU is preferred over reporting accuracy.	2012-07-14 09:13:27 +02:00