Melanie 522f36345d Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs		2012-06-02 01:40:42 +01:00
..
BasicPhysicsPlugin	refactor: simply some properties code in BasicPhysicsPlugin	2012-04-22 20:28:12 +01:00
BulletSPlugin	BulletSim: make avatar animations update properly.	2012-03-26 17:36:33 -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	Downgrade an error log message to info because there is nothing we can do if	2012-04-16 17:32:30 +02:00
OdePlugin	Merge branch 'master' into careminster	2012-06-02 01:40:42 +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	ubitode prim: if makebody() is called already having a body, do a full destrution so there are no 'leaks'.	2012-05-30 21:32:15 +01:00