Melanie c6e9db5866 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs		2014-01-28 21:02:20 +00:00
..
MSSQL	…
MySQL	…
Null	…
PGSQL	…
Properties	…
Resources	…
SQLite	…
Tests	…
AssetDataBase.cs	…
DBGuids.cs	…
IAssetData.cs	Merge branch 'master' into careminster-presence-refactor	2010-09-13 16:17:38 +01:00
IAuthenticationData.cs	Fully implement unencrypted auth token operations	2009-09-04 07:48:09 +01:00
IAvatarData.cs	…
IFriendsData.cs	…
IGridUserData.cs	…
IGroupsData.cs	…
IHGTravelingData.cs	…
IInventoryData.cs	…
IOfflineIMData.cs	…
IPresenceData.cs	…
IProfilesData.cs	…
IRegionData.cs	…
IUserAccountData.cs	…
IXAssetDataPlugin.cs	…
IXGroupData.cs	…
IXInventoryData.cs	…
IniConfig.cs	…
Migration.cs	…