Melanie 0c00abcce1 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs		2012-08-03 16:46:11 +01:00
..
AssetService.cs	Merge branch 'master' into careminster	2012-08-03 16:46:11 +01:00
AssetServiceBase.cs	Send the config section name up to the service classes themselves (XInventory and Assets).	2012-03-27 10:08:13 -07:00
XAssetService.cs	minor: Comment out "Deleting asset" log messages for now	2012-08-03 00:25:22 +01:00
XAssetServiceBase.cs	Fix configuration problems where XAssetDatabasePlugin was picked up accidentally.	2012-03-19 00:18:04 +00:00