Melanie fb8e92c90b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Helpers.cs
	prebuild.xml

2012-07-23 18:54:12 +01:00

..

BasicPhysicsPlugin

Remove some mono compiler warnings

2012-06-30 01:25:39 +01:00

BulletSPlugin

BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs attempting to fix a mono compile error.

2012-07-20 15:34: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 'avination' into ubitwork

2012-07-17 00:54:23 +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

Update ubitMesh primMesher with new Dahlia version on core ( reckick git

2012-07-19 11:12:53 +01:00

UbitOdePlugin

UbitOde: remove useless water collider from active code.

2012-07-17 00:27:01 +01:00