Melanie 5536cdf90c Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge ...

Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs

2011-10-11 23:01:52 +01:00

..

Filesystem

Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.

2011-09-24 01:59:02 +01:00

Web

Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge

2011-10-11 23:01:52 +01:00