Melanie f70357eaa3 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs		2013-06-23 01:59:57 +01:00
..
EstateDataService.cs	Reattaching a region was failing if the estate name had not changed (issue 5035).	2011-09-16 18:50:25 +01:00
SimulationDataService.cs	Add a skeleton for a name value storage associated with regions	2012-08-15 02:06:22 +01:00
SimulationServiceConnector.cs	Merge branch 'master' into careminster	2013-06-23 01:59:57 +01:00