Melanie 6137f37028 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-06-29 22:24:53 +01: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

Fix a regression where we stopped removing avatars from collision event reporting on logout, rather than stopping clearing their collision events.

2012-06-29 00:36:50 +01:00

ODEDynamics.c_comments

Commit initial version of KittoFlora's vehicle changes

2009-09-30 18:51:02 +02:00

ODEDynamics.cs

minor: remove some mono compiler warnings

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

OdePhysicsJoint.cs

…

OdePlugin.cs

Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.

2012-02-21 02:52:20 +00:00

ODEPrim.cs

Merge branch 'master' into careminster

2012-04-24 21:30:12 +01:00

ODERayCastRequestManager.cs

Merge branch 'master' into bigmerge

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

OdeScene.cs

Move update of the final optional ODE total frame stat inside the OdeLock rather than outside to avoid a very occasional race condition with the stat collection thread

2012-06-29 01:02:35 +01:00