Melanie 375114bea3 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs

2013-02-07 01:40:11 +00:00

..

JsonStore

Enables script access to the per object dynamic attributes through the JsonStore

2013-02-06 17:29:17 -08:00

Minimodule

One more module converted: MRMModule.

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

ObjectModules

Add copyright headers.

2009-03-07 02:11:50 +00:00

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