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

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2013-02-15 21:42:16 +00:00

..

ExtendedPhysics

BulletSim: fix avatar bobbing or jiggling while stationary flying.

2013-02-08 16:29:40 -08:00

JsonStore

Enable one sub-test in TestJsonSetValue() which now works (using identifier with embedded .).

2013-02-15 01:00:49 +00:00

Minimodule

One more module converted: MRMModule.

2012-11-11 16:18:47 -08:00

ObjectModules

…

RegionReadyModule

All optional modules' directives moved out of addin.xml

2012-11-13 09:48:56 -08:00

XmlRpcRouterModule

Merge branch 'master' into careminster

2013-01-02 11:52:37 +00:00