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

1 files changed, 37 insertions, 0 deletions

diff --git a/OpenSim/Data/SQLiteLegacy/Resources/010_UserStore.sql b/OpenSim/Data/SQLiteLegacy/Resources/010_UserStore.sql
new file mode 100644
index 0000000..5f956da
--- /dev/null
+++ b/OpenSim/Data/SQLiteLegacy/Resources/010_UserStore.sql
@@ -0,0 +1,37 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS avatarappearance(
+  Owner varchar(36) NOT NULL primary key,
+  BodyItem varchar(36) DEFAULT NULL,
+  BodyAsset varchar(36) DEFAULT NULL,
+  SkinItem varchar(36) DEFAULT NULL,
+  SkinAsset varchar(36) DEFAULT NULL,
+  HairItem varchar(36) DEFAULT NULL,
+  HairAsset varchar(36) DEFAULT NULL,
+  EyesItem varchar(36) DEFAULT NULL,
+  EyesAsset varchar(36) DEFAULT NULL,
+  ShirtItem varchar(36) DEFAULT NULL,
+  ShirtAsset varchar(36) DEFAULT NULL,
+  PantsItem varchar(36) DEFAULT NULL,
+  PantsAsset varchar(36) DEFAULT NULL,
+  ShoesItem varchar(36) DEFAULT NULL,
+  ShoesAsset varchar(36) DEFAULT NULL,
+  SocksItem varchar(36) DEFAULT NULL,
+  SocksAsset varchar(36) DEFAULT NULL,
+  JacketItem varchar(36) DEFAULT NULL,
+  JacketAsset varchar(36) DEFAULT NULL,
+  GlovesItem varchar(36) DEFAULT NULL,
+  GlovesAsset varchar(36) DEFAULT NULL,
+  UnderShirtItem varchar(36) DEFAULT NULL,
+  UnderShirtAsset varchar(36) DEFAULT NULL,
+  UnderPantsItem varchar(36) DEFAULT NULL,
+  UnderPantsAsset varchar(36) DEFAULT NULL,
+  SkirtItem varchar(36) DEFAULT NULL,
+  SkirtAsset varchar(36) DEFAULT NULL,
+  Texture blob,
+  VisualParams blob,
+  Serial int DEFAULT NULL,
+  AvatarHeight float DEFAULT NULL
+);
+
+COMMIT;