Melanie b9146a7922 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2013-03-15 23:45:32 +00: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	Migrate assets from chained asset service to xassetservice as they are requested.	2013-03-15 22:33:39 +00:00
XAssetServiceBase.cs	Make it possible to chain another asset service underneath the de-duplicating XAssetService.	2013-03-15 21:53:39 +00:00