Melanie 0c00abcce1 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs		2012-08-03 16:46:11 +01:00
..
BasicPhysicsPlugin	Remove some mono compiler warnings	2012-06-30 01:25:39 +01:00
BulletSPlugin	BulletSim: Debugging log statements added. Reduced size of updata buffer trying to find a corrupted memory problem. Update DLL and SO.	2012-08-02 16:30:23 -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-08-01 23:03:03 +01:00
Meshing	Merge branch 'master' into careminster	2012-07-16 21:32:10 +01:00
OdePlugin	Merge branch 'master' into careminster	2012-07-28 00:39:36 +01:00
POSPlugin	Merge branch 'master' into careminster	2011-12-22 16:37:25 +00:00
UbitMeshing	Update ubitMesh primMesher with new Dahlia version on core ( reckick git	2012-07-19 11:12:53 +01:00
UbitOdePlugin	Change the stair fudge factor so steps of 0.5m can be climbled to match inworldz claims and SL's realities	2012-07-27 03:24:45 +02:00