Justin Clark-Casey (justincc) 2f6d401db1 Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes ... This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead. Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs		2010-06-04 18:00:48 +01:00
..
local.include	Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes	2010-06-04 18:00:48 +01:00