Melanie 7914eaa357 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	bin/OpenSimDefaults.ini

2013-07-25 16:55:23 +01:00

..

Agent

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00

Asset

Merge branch 'master' into careminster

2013-03-31 20:56:13 +01:00

Avatar

Merge branch 'master' into careminster

2013-07-24 03:50:09 +01:00

Framework

Merge branch 'master' into careminster

2013-07-25 16:55:23 +01:00

Hypergrid

Merge branch 'master' into careminster

2013-02-26 13:34:20 +00:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Scripting

Merge branch 'master' into careminster

2013-07-24 03:50:09 +01:00

ServiceConnectorsIn

UserProfiles

2013-05-30 17:59:18 -04:00

ServiceConnectorsOut

Merge branch 'master' into careminster

2013-07-25 16:55:23 +01:00

World

Merge branch 'master' into careminster

2013-07-18 10:08:10 +01:00