Melanie a022ee5766 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs

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

..

Asset

Fix test for adding temporary assets. Code for non-local temporary assets

2013-06-10 15:14:55 -07: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

UserProfiles

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

GridUser

Last 27 modules' directives (service connectors out).

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

Inventory

Strengthen some assumptions.

2013-06-05 20:19:59 -07: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-05-16 21:59:14 +01:00

UserAccounts

Merge branch 'master' into careminster

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