Melanie fdfc4ab2a8 Merge branch 'master' into careminster ... Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs		2012-01-06 00:08:18 +00:00
..
Base	Catch any exceptions exiting the top of the robust console, as we already do for the main simulator.	2011-11-02 13:16:02 +00:00
Handlers	Merge branch 'master' into careminster	2012-01-06 00:08:18 +00:00
ServerMain.cs	fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work	2010-05-28 21:14:15 +01:00