Melanie 31ab8b2fe0 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2012-05-05 10:32:04 +01:00

..

Base

Minor improvements to logging

2012-04-24 21:38:09 +01:00

Handlers

Merge branch 'master' into careminster

2012-05-05 10:32:04 +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