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

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

2013-06-30 18:27:30 +01:00

..

Properties

Deleted all AssemblyFileVersion directives

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

AssetService.cs

Merge branch 'master' into careminster

2013-03-15 23:45:32 +00:00

AssetServiceBase.cs

Add basic asset connector tests to check behaviour for normal, local and temporary assets.

2012-09-15 02:12:26 +01:00

XAssetService.cs

In XAssetService, on a delete asset request also delete the asset in any chained service.

2013-06-28 19:11:44 +01:00

XAssetServiceBase.cs

Make it possible to chain another asset service underneath the de-duplicating XAssetService.

2013-03-15 21:53:39 +00:00