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

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs

2012-11-12 15:46:45 +00:00

..

JsonStore

Allow an incoming identifier to be specified for a JsonStore.

2012-09-11 16:42:07 -07: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

Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."

2012-09-30 07:48:03 -07:00

XmlRpcRouterModule

Merge branch 'master' into careminster

2012-11-12 15:46:45 +00:00