Melanie 4ce42762ee Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-01-26 00:21:21 +00:00

..

Tests

Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId!

2011-11-16 23:01:59 +00:00

AssemblyInfo.cs

…

drawstuff.cs

…

ODECharacter.cs

Serialize calls to ODE Collide() function across OdeScene instances to prevent ODE crashes on simulators running more than one region.

2012-01-25 19:31:50 +00:00

ODEDynamics.c_comments

…

ODEDynamics.cs

minor: remove some mono compiler warnings

2010-06-25 21:09:15 +01:00

OdePhysicsJoint.cs

…

OdePlugin.cs

Remove the unused CollisionLocker from ODE

2011-10-18 17:35:58 +01:00

ODEPrim.cs

Merge branch 'master' into careminster

2011-12-22 16:37:25 +00:00

ODERayCastRequestManager.cs

Merge branch 'master' into bigmerge

2011-11-17 19:04:27 +00:00

OdeScene.cs

Serialize calls to ODE Collide() function across OdeScene instances to prevent ODE crashes on simulators running more than one region.

2012-01-25 19:31:50 +00:00