Melanie 81552f41c6 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs		2013-03-05 23:57:53 +00:00
..
LoadRegions	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
RegionModulesController	minor: Log number of region modules loaded from each plugin	2013-03-02 00:56:53 +00:00
RemoteController	Merge branch 'master' into careminster	2013-02-22 01:28:54 +00:00
Rest	Comment out the long unused afaik HTTP agent handlers.	2012-09-21 00:29:13 +01:00