Melanie fe4a67efb6 Merge branch 'avination-current' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
	OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
	OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs

2013-06-06 03:20:15 +01:00

..

EntityTransferModule.cs

Merge branch 'avination-current' into careminster

2013-06-06 03:20:15 +01:00

EntityTransferStateMachine.cs

Merge branch 'master' into careminster

2013-03-22 01:02:17 +00:00

HGEntityTransferModule.cs

Step one of estate settings sharing - port the Avination Estate module (complete module) as changes are too extensive to apply manually

2013-05-07 00:31:11 +01:00