Melanie 243acef917 Merge branch 'master' into bigmerge ... Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2011-11-03 00:06:14 +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 commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge	2011-10-25 03:26:09 +01: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