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

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs

2013-08-17 03:23:45 +01:00

..

LoadRegions

On startup, start scenes after we're set up all local scenes, rather than starting scenes before others have been created.

2013-05-03 18:48:50 +01:00

RegionModulesController

minor: Log number of region modules loaded from each plugin

2013-03-02 00:56:53 +00:00

RemoteController

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00