Melanie 12971e73d4 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs

2013-02-08 23:29:47 +00:00

..

JsonStore

Adds size limits to JsonStore. Adds a separate configuration

2013-02-08 15:07:43 -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