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

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs

2012-05-19 13:34:44 +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

drawstuff.cs

Minor formatting cleanup.

2008-12-09 12:15:02 +00:00

ODECharacter.cs

refactor: move EventQueueGet path generation into common method. Rename some local variables in line with code conventions. Add commented out EQG log lines for future use.

2012-05-18 00:38:29 +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

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

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

Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths.

2012-04-21 03:42:54 +01:00