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

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs

2012-09-16 04:11:20 +01:00

..

JsonStore

Allow an incoming identifier to be specified for a JsonStore.

2012-09-11 16:42:07 -07:00

Minimodule

Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.

2012-07-11 22:54:22 +01:00

ObjectModules

Add copyright headers.

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

RegionReadyModule

Support multi-region OAR files

2012-09-14 20:25:03 +01:00

ScriptModuleComms

Type.Type is RuntimeType

2012-08-31 15:33:15 +01:00

XmlRpcRouterModule

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00