Melanie 7cf377fff0 Merge branch 'master' into careminster ... Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs		2013-04-10 13:20:55 +01:00
..
AssetService	Merge branch 'master' into careminster	2013-03-15 23:45:32 +00:00
AuthenticationService	Merge branch 'master' into careminster	2013-02-22 01:28:54 +00:00
AuthorizationService	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
AvatarService	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
Base	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
Connectors	Merge branch 'master' into careminster	2013-04-10 13:20:55 +01:00
FreeswitchService	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
Friends	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
GridService	Switched to using the other Util function with a default value.	2013-02-27 20:59:16 -08:00
HypergridService	Merge branch 'master' into careminster	2013-02-28 21:20:07 +00:00
Interfaces	Multiattach, part 2	2013-03-18 22:56:17 +00:00
InventoryService	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	2013-03-26 03:40:06 +00:00
LLLoginService	Merge branch 'master' into careminster	2013-02-28 21:20:07 +00:00
MapImageService	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
PresenceService	Deleted all AssemblyFileVersion directives	2013-02-19 17:14:55 -08:00
UserAccountService	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask	2013-03-26 03:40:06 +00:00