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

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs

2012-05-02 01:37:51 +01:00

..

Clients

Updated the UserAccountsClient a little bit, plus some more sanity checks on the service connector.

2012-03-21 11:22:39 -07:00

Common

Merge branch 'master' into careminster

2012-05-02 01:37:51 +01:00

Torture

Add regression test for teleporting an agent between separated regions on the same simulator.

2012-04-27 00:58:54 +01:00

ConfigurationLoaderTest.cs

Shell Environment Variables in config

2011-11-23 10:11:47 -05:00