Melanie 771d79e83e Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml		2012-07-28 00:39:36 +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	Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.	2009-06-01 06:37:14 +00:00
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
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
OdePhysicsJoint.cs	Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.	2009-06-01 06:37:14 +00:00
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
OdeScene.cs	Remove the LandGeom checks in OdeScene - these are pointless since LandGeom is always IntPtr.Zero and contacts returned always have a valid geometry.	2012-07-27 23:31:19 +01:00
drawstuff.cs	Minor formatting cleanup.	2008-12-09 12:15:02 +00:00