Melanie 69054ad134 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs		2013-10-06 18:32:20 +01:00
..
Properties	Bump OPenSimulator version and assembly versions up to 0.8.0 Dev	2013-10-04 23:33:47 +01: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