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

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-09-24 20:14:00 +01:00

..

LoadRegions

Saving estate state is really slow (relatively) and it gets

2012-05-10 09:08:40 -07:00

RegionModulesController

refactor some common code in RegionModulesControllerPlugin

2010-12-04 02:38:26 +00:00

RemoteController

Merge branch 'master' into careminster

2012-09-24 20:14:00 +01:00

Rest

Comment out the long unused afaik HTTP agent handlers.

2012-09-21 00:29:13 +01:00