Melanie fd7a83f439 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs		2012-11-25 14:13:50 +00: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-11-25 14:13:50 +00:00
Performance	Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests	2012-11-24 03:15:24 +00:00
Stress	Revert "Merge master into teravuswork", it should have been avination, not master.	2012-11-15 10:05:16 -05:00
ConfigurationLoaderTest.cs	Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests	2012-11-24 03:15:24 +00:00