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

..

AssetTransaction

Merge branch 'avination' into careminster

2012-09-27 17:29:44 +01:00

IPBan

One more more converted: IPBanModule.

2012-11-09 22:21:11 -08:00

TextureSender

J2KDecoderModule: move the code out of PostInitialise()

2012-11-11 13:49:07 -08:00

Xfer

Merge branch 'master' into careminster

2012-11-11 16:31:01 +00:00