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

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

2013-02-06 02:22:12 +00:00

..

JsonStore

Allow JsonReadNotecard() to accept the name of the notecard as well as the asset ID.

2013-02-06 01:37:22 +00: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