Melanie 5768a151ff Merge branch 'master' into careminster ... Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs		2012-03-20 02:48:11 +00:00
..
AssetService.cs	Merge branch 'master' into careminster	2012-01-06 00:08:18 +00:00
AssetServiceBase.cs	Fix the AssetServiceBase bug I introduced by reordering configuration load	2009-06-23 08:37:12 +00:00
XAssetService.cs	Fix configuration problems where XAssetDatabasePlugin was picked up accidentally.	2012-03-19 00:18:04 +00:00
XAssetServiceBase.cs	Fix configuration problems where XAssetDatabasePlugin was picked up accidentally.	2012-03-19 00:18:04 +00:00