Melanie 70f0587558 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

2013-03-08 01:07:05 +00:00

..

Asset

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

Authentication

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Authorization

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

Avatar

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

Grid

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

GridUser

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

Inventory

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

Land

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

MapImage

Merge branch 'master' into careminster

2013-02-04 19:21:39 +00:00

Neighbour

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

Presence

minor: Fix more compiler warnings in CoreModules tests by properly overriding OpenSimTestCase.SetUp()

2012-12-05 23:44:12 +00:00

Simulation

Merge branch 'master' into careminster

2013-03-08 01:07:05 +00:00

UserAccounts

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00