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

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

2012-02-23 01:49:14 +00:00

..

EstateDataService.cs

Reattaching a region was failing if the estate name had not changed (issue 5035).

2011-09-16 18:50:25 +01:00

SimulationDataService.cs

minor: remove mono compiler warnings

2011-01-18 00:14:58 +00:00

SimulationServiceConnector.cs

Merge branch 'master' into careminster

2012-02-23 01:49:14 +00:00