Initial update to OpenSim 0.8.2.1 source code.

19 files changed, 368 insertions, 54 deletions

diff --git a/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
new file mode 100644
index 0000000..e496f72
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/AgentPrefs.migrations
@@ -0,0 +1,18 @@
+:VERSION 1           # -------------------------
+
+BEGIN;
+
+CREATE TABLE `AgentPrefs` (
+    `PrincipalID` CHAR(36) NOT NULL,
+    `AccessPrefs` CHAR(2) NOT NULL DEFAULT 'M',
+    `HoverHeight` DOUBLE(30, 27) NOT NULL DEFAULT 0,
+    `Language` CHAR(5) NOT NULL DEFAULT 'en-us',
+    `LanguageIsPublic` BOOLEAN NOT NULL DEFAULT 1,
+    `PermEveryone` INT(6) NOT NULL DEFAULT 0,
+    `PermGroup` INT(6) NOT NULL DEFAULT 0,
+    `PermNextOwner` INT(6) NOT NULL DEFAULT 532480,
+    UNIQUE KEY `PrincipalID` (`PrincipalID`),
+    PRIMARY KEY(`PrincipalID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
index f7211c2..661d825 100644
--- a/OpenSim/Data/MySQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
@@ -13,7 +13,7 @@ CREATE TABLE `assets` (
   `temporary` tinyint(1) NOT NULL,
   `data` longblob NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
 
 COMMIT;
 
@@ -75,3 +75,7 @@ ALTER TABLE assets ADD COLUMN asset_flags INTEGER NOT NULL DEFAULT 0;
 
 ALTER TABLE assets ADD COLUMN CreatorID varchar(128) NOT NULL DEFAULT '';
 
+:VERSION 9
+
+BEGIN;
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/AuthStore.migrations b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
index 9450940..023c786 100644
--- a/OpenSim/Data/MySQL/Resources/AuthStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
@@ -8,7 +8,7 @@ CREATE TABLE `auth` (
   `passwordSalt` char(32) NOT NULL default '',
   `webLoginKey` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`UUID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 CREATE TABLE `tokens` (
   `UUID` char(36) NOT NULL,
@@ -18,7 +18,7 @@ CREATE TABLE `tokens` (
   KEY `UUID` (`UUID`),
   KEY `token` (`token`),
   KEY `validity` (`validity`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 commit;
 
diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
index 6ef92ee..2d1c2b5 100644
--- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -10,19 +10,19 @@ CREATE TABLE IF NOT EXISTS `estate_managers` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `estate_groups` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `estate_users` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `estateban` (
   `EstateID` int(10) unsigned NOT NULL,
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `estateban` (
   `bannedIpHostMask` varchar(16) NOT NULL,
   `bannedNameMask` varchar(64) default NULL,
   KEY `estateban_EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 CREATE TABLE IF NOT EXISTS `estate_settings` (
   `EstateID` int(10) unsigned NOT NULL auto_increment,
@@ -60,14 +60,14 @@ CREATE TABLE IF NOT EXISTS `estate_settings` (
   `DenyMinors` tinyint not null,
   
   PRIMARY KEY  (`EstateID`)
-) ENGINE=MyISAM AUTO_INCREMENT=100;
+) ENGINE=InnoDB AUTO_INCREMENT=100;
 
 CREATE TABLE IF NOT EXISTS `estate_map` (
   `RegionID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
   `EstateID` int(11) NOT NULL,
   PRIMARY KEY  (`RegionID`),
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 COMMIT;
 
@@ -77,5 +77,11 @@ BEGIN;
 ALTER TABLE estate_settings AUTO_INCREMENT = 100;
 COMMIT;
 
+:VERSION 33                     #--------------------- 
 
+BEGIN;
+ALTER TABLE estate_settings ADD COLUMN `AllowLandmark` tinyint(4) NOT NULL default '1';
+ALTER TABLE estate_settings ADD COLUMN `AllowParcelChanges` tinyint(4) NOT NULL default '1';
+ALTER TABLE estate_settings ADD COLUMN `AllowSetHome` tinyint(4) NOT NULL default '1';
+COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
new file mode 100644
index 0000000..87d08c6
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/FSAssetStore.migrations
@@ -0,0 +1,18 @@
+# -----------------
+:VERSION 1
+
+BEGIN;
+
+CREATE TABLE `fsassets` (
+  `id` char(36) NOT NULL,
+  `name` varchar(64) NOT NULL DEFAULT '',
+  `description` varchar(64) NOT NULL DEFAULT '',
+  `type` int(11) NOT NULL,
+  `hash` char(80) NOT NULL,
+  `create_time` int(11) NOT NULL DEFAULT '0',
+  `access_time` int(11) NOT NULL DEFAULT '0',
+  `asset_flags` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
index 55d82ec..5faf956 100644
--- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -9,7 +9,7 @@ CREATE TABLE `Friends` (
         `Offered` VARCHAR(32) NOT NULL DEFAULT 0, 
         PRIMARY KEY(`PrincipalID`, `Friend`), 
         KEY(`PrincipalID`)
-);
+) ENGINE=InnoDB;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/GridStore.migrations b/OpenSim/Data/MySQL/Resources/GridStore.migrations
index b010c63..b8d287a 100644
--- a/OpenSim/Data/MySQL/Resources/GridStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridStore.migrations
@@ -1,5 +1,7 @@
 :VERSION 1
 
+BEGIN;
+
 CREATE TABLE `regions` (
   `uuid` varchar(36) NOT NULL,
   `regionHandle` bigint(20) unsigned NOT NULL,
@@ -31,7 +33,9 @@ CREATE TABLE `regions` (
   KEY `regionName` (`regionName`),
   KEY `regionHandle` (`regionHandle`),
   KEY `overrideHandles` (`eastOverrideHandle`,`westOverrideHandle`,`southOverrideHandle`,`northOverrideHandle`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Rev. 3';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+COMMIT;
 
 :VERSION 2
 
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index e2be27e..d08e096 100644
--- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -14,7 +14,7 @@ CREATE TABLE `GridUser` (
     `Login` CHAR(16) NOT NULL DEFAULT '0',
     `Logout` CHAR(16) NOT NULL DEFAULT '0',
     PRIMARY KEY  (`UserID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..b4e4422
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
@@ -0,0 +1,18 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE `hg_traveling_data` (
+    `SessionID` VARCHAR(36) NOT NULL,
+    `UserID` VARCHAR(36) NOT NULL,
+        `GridExternalName` VARCHAR(255) NOT NULL DEFAULT '',
+        `ServiceToken` VARCHAR(255) NOT NULL DEFAULT '',
+        `ClientIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
+        `MyIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
+    `TMStamp` timestamp NOT NULL,
+    PRIMARY KEY  (`SessionID`),
+        KEY (`UserID`)
+) ENGINE=InnoDB;
+
+COMMIT;
+
diff --git a/OpenSim/Data/MySQL/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
new file mode 100644
index 0000000..79ead98
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
@@ -0,0 +1,42 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE `im_offline` (
+  `ID` MEDIUMINT NOT NULL AUTO_INCREMENT,
+  `PrincipalID` char(36) NOT NULL default '',
+  `Message` text NOT NULL,
+  `TMStamp` timestamp NOT NULL,
+  PRIMARY KEY  (`ID`),
+  KEY `PrincipalID` (`PrincipalID`)
+) ENGINE=MyISAM;
+
+COMMIT;
+
+:VERSION 2         # -------------------------- 
+
+BEGIN;
+
+INSERT INTO `im_offline` SELECT * from `diva_im_offline`;
+DROP TABLE `diva_im_offline`;
+DELETE FROM `migrations` WHERE name='diva_im_Store';
+
+COMMIT;
+
+:VERSION 3         # -------------------------- 
+
+BEGIN;
+
+ALTER TABLE `im_offline`
+  ADD `FromID` char(36) NOT NULL default '' AFTER `PrincipalID`,
+  ADD KEY `FromID` (`FromID`);
+
+COMMIT;
+
+:VERSION 4         # -------------------------- 
+
+BEGIN;
+
+ALTER TABLE im_offline CONVERT TO CHARACTER SET utf8;
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
index ca2fe11..993a5a0 100644
--- a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations
@@ -11,7 +11,7 @@ CREATE TABLE `inventoryfolders` (
   PRIMARY KEY  (`folderID`),
   KEY `owner` (`agentID`),
   KEY `parent` (`parentFolderID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `inventoryitems` (
   `inventoryID` varchar(36) NOT NULL default '',
@@ -36,7 +36,7 @@ CREATE TABLE `inventoryitems` (
   PRIMARY KEY  (`inventoryID`),
   KEY `owner` (`avatarID`),
   KEY `folder` (`parentFolderID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/LogStore.migrations b/OpenSim/Data/MySQL/Resources/LogStore.migrations
index b572411..9ac26ac 100644
--- a/OpenSim/Data/MySQL/Resources/LogStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/LogStore.migrations
@@ -10,4 +10,4 @@ CREATE TABLE `logs` (
   `priority` int(11) default NULL,
   `message` text,
   PRIMARY KEY  (`logID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/OpenSim/Data/MySQL/Resources/Presence.migrations b/OpenSim/Data/MySQL/Resources/Presence.migrations
index 5dc96d2..c4e40fa 100644
--- a/OpenSim/Data/MySQL/Resources/Presence.migrations
+++ b/OpenSim/Data/MySQL/Resources/Presence.migrations
@@ -1,4 +1,4 @@
-:VERSION 1         # -------------------------- 
+:VERSION 1         # -------------------------- 
 
 BEGIN;
 
@@ -7,7 +7,7 @@ CREATE TABLE `Presence` (
     `RegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
     `SessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
     `SecureSessionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 CREATE UNIQUE INDEX SessionID ON Presence(SessionID);
 CREATE INDEX UserID ON Presence(UserID);
@@ -21,3 +21,11 @@ BEGIN;
 ALTER TABLE `Presence` ADD COLUMN LastSeen timestamp;
 
 COMMIT;
+
+:VERSION 3         # -------------------------- 
+
+BEGIN;
+
+CREATE INDEX RegionID ON Presence(RegionID);
+
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 071f64e..ac31380 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -146,7 +146,7 @@ CREATE TABLE `land` (
   `UserLookAtZ` float default NULL,
   `AuthbuyerID` varchar(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
   PRIMARY KEY  (`UUID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `landaccesslist` (
   `LandUUID` varchar(255) default NULL,
@@ -168,7 +168,7 @@ COMMIT;
 :VERSION 3                      #---------------------
 
 BEGIN;
-  CREATE TABLE regionban (regionUUID VARCHAR(36) NOT NULL, bannedUUID VARCHAR(36) NOT NULL, bannedIp VARCHAR(16) NOT NULL, bannedIpHostMask VARCHAR(16) NOT NULL) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+  CREATE TABLE regionban (regionUUID VARCHAR(36) NOT NULL, bannedUUID VARCHAR(36) NOT NULL, bannedIp VARCHAR(16) NOT NULL, bannedIpHostMask VARCHAR(16) NOT NULL) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
 COMMIT;
 
 :VERSION 4                      #---------------------
@@ -226,13 +226,13 @@ COMMIT;
 
 BEGIN;
 
-alter table landaccesslist ENGINE = MyISAM;
-alter table migrations ENGINE = MyISAM;
-alter table primitems ENGINE = MyISAM;
-alter table prims ENGINE = MyISAM;
-alter table primshapes ENGINE = MyISAM;
-alter table regionsettings ENGINE = MyISAM;
-alter table terrain ENGINE = MyISAM;
+alter table landaccesslist ENGINE = InnoDB;
+alter table migrations ENGINE = InnoDB;
+alter table primitems ENGINE = InnoDB;
+alter table prims ENGINE = InnoDB;
+alter table primshapes ENGINE = InnoDB;
+alter table regionsettings ENGINE = InnoDB;
+alter table terrain ENGINE = InnoDB;
 
 COMMIT;
 
@@ -384,7 +384,7 @@ CREATE TABLE `regionsettings` (
   `covenant` char(36) default NULL,
   `Sandbox` tinyint(4) NOT NULL,
   PRIMARY KEY  (`regionUUID`)
-) ENGINE=MyISAM;
+) ENGINE=InnoDB;
 
 commit;
 
@@ -852,7 +852,7 @@ CREATE TABLE IF NOT EXISTS `spawn_points` (
   `Pitch` float NOT NULL,
   `Distance` float NOT NULL,
   KEY `RegionID` (`RegionID`)
-) ENGINE=MyISAM;
+) ENGINE=Innodb;
 
 ALTER TABLE `regionsettings` ADD COLUMN `TelehubObject` varchar(36) NOT NULL;
 COMMIT;
@@ -891,7 +891,7 @@ CREATE TABLE `regionenvironment` (
   `region_id` varchar(36) NOT NULL,
   `llsd_settings` TEXT NOT NULL,
   PRIMARY KEY (`region_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
 
@@ -902,3 +902,49 @@ BEGIN;
 CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`));
 
 COMMIT;
+
+:VERSION 46       #---------------- Dynamic attributes
+
+BEGIN;
+
+ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
+
+COMMIT;
+
+:VERSION 47       #---------------- Extra physics params
+
+BEGIN;
+
+ALTER TABLE prims ADD COLUMN `PhysicsShapeType` tinyint(4) NOT NULL default '0';
+ALTER TABLE prims ADD COLUMN `Density` double NOT NULL default '1000';
+ALTER TABLE prims ADD COLUMN `GravityModifier` double NOT NULL default '1';
+ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6';
+ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5';
+
+COMMIT;
+
+:VERSION 48       #---------------- Keyframes
+
+BEGIN;
+
+ALTER TABLE prims ADD COLUMN `KeyframeMotion` blob;
+
+COMMIT;
+
+:VERSION 49         #--------------------- Save attachment info
+
+BEGIN;
+ALTER TABLE prims ADD COLUMN AttachedPosX double default 0;
+ALTER TABLE prims ADD COLUMN AttachedPosY double default 0;
+ALTER TABLE prims ADD COLUMN AttachedPosZ double default 0;
+ALTER TABLE primshapes ADD COLUMN LastAttachPoint int(4) not null default '0';
+COMMIT;
+
+:VERSION 50        #---- Change LandFlags to unsigned
+
+BEGIN;
+
+ALTER TABLE land CHANGE COLUMN LandFlags LandFlags int unsigned default null;
+
+COMMIT;
+
diff --git a/OpenSim/Data/MySQL/Resources/UserAccount.migrations b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
index 97e5e4f..84011e6 100644
--- a/OpenSim/Data/MySQL/Resources/UserAccount.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserAccount.migrations
@@ -10,7 +10,7 @@ CREATE TABLE `UserAccounts` (
     `Email` VARCHAR(64),
     `ServiceURLs` TEXT,
     `Created` INT(11)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 COMMIT;
 
diff --git a/sql/osprofile.sql b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index bcd5be0..87e99fa 100644
--- a/sql/osprofile.sql
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -1,3 +1,7 @@
+:VERSION 1         # -------------------------------
+
+begin;
+
 CREATE TABLE IF NOT EXISTS `classifieds` (
   `classifieduuid` char(36) NOT NULL,
   `creatoruuid` char(36) NOT NULL,
@@ -15,7 +19,8 @@ CREATE TABLE IF NOT EXISTS `classifieds` (
   `classifiedflags` int(8) NOT NULL,
   `priceforlisting` int(5) NOT NULL,
   PRIMARY KEY (`classifieduuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
 
 CREATE TABLE IF NOT EXISTS `usernotes` (
   `useruuid` varchar(36) NOT NULL,
@@ -24,6 +29,7 @@ CREATE TABLE IF NOT EXISTS `usernotes` (
   UNIQUE KEY `useruuid` (`useruuid`,`targetuuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
+
 CREATE TABLE IF NOT EXISTS `userpicks` (
   `pickuuid` varchar(36) NOT NULL,
   `creatoruuid` varchar(36) NOT NULL,
@@ -41,6 +47,7 @@ CREATE TABLE IF NOT EXISTS `userpicks` (
   PRIMARY KEY (`pickuuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
+
 CREATE TABLE IF NOT EXISTS `userprofile` (
   `useruuid` varchar(36) NOT NULL,
   `profilePartner` varchar(36) NOT NULL,
@@ -59,6 +66,23 @@ CREATE TABLE IF NOT EXISTS `userprofile` (
   PRIMARY KEY (`useruuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
+commit;
+
+:VERSION 2         # -------------------------------
+ 
+begin;
+CREATE TABLE IF NOT EXISTS `userdata` (
+    `UserId` char(36) NOT NULL,
+    `TagId` varchar(64) NOT NULL,
+    `DataKey` varchar(255),
+    `DataVal` varchar(255),
+    PRIMARY KEY (`UserId`,`TagId`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+commit;
+
+:VERSION 3         # -------------------------------
+begin;
 CREATE TABLE IF NOT EXISTS `usersettings` (
   `useruuid` varchar(36) NOT NULL,
   `imviaemail` enum('true','false') NOT NULL,
@@ -66,3 +90,9 @@ CREATE TABLE IF NOT EXISTS `usersettings` (
   `email` varchar(254) NOT NULL,
   PRIMARY KEY (`useruuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+commit;
+
+:VERSION 4         # -------------------------------
+begin;
+ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
+commit;
diff --git a/OpenSim/Data/MySQL/Resources/UserStore.migrations b/OpenSim/Data/MySQL/Resources/UserStore.migrations
index 9129075..f054611 100644
--- a/OpenSim/Data/MySQL/Resources/UserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserStore.migrations
@@ -21,7 +21,7 @@ CREATE TABLE `agents` (
   PRIMARY KEY  (`UUID`),
   UNIQUE KEY `session` (`sessionID`),
   UNIQUE KEY `ssession` (`secureSessionID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- Create schema avatar_appearance
 --
@@ -59,7 +59,7 @@ CREATE TABLE `avatarappearance` (
   Skirt_Item char(36) NOT NULL,
   Skirt_Asset char(36) NOT NULL,
   PRIMARY KEY  (`Owner`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 SET FOREIGN_KEY_CHECKS=0;
 -- ----------------------------
@@ -71,7 +71,7 @@ CREATE TABLE `userfriends` (
    `friendPerms` INT NOT NULL,
    `datetimestamp` INT NOT NULL,
          UNIQUE KEY  (`ownerID`, `friendID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 -- ----------------------------
 -- Table structure for users
 -- ----------------------------
@@ -101,7 +101,7 @@ CREATE TABLE `users` (
   `webLoginKey` varchar(36) default NULL,
   PRIMARY KEY  (`UUID`),
   UNIQUE KEY `usernames` (`username`,`lastname`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records 
@@ -138,7 +138,7 @@ COMMIT;
 
 BEGIN;
 
-CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL, `attachpoint` int(11) NOT NULL, `item` char(36) NOT NULL, `asset` char(36) NOT NULL) ENGINE=MyISAM;
+CREATE TABLE `avatarattachments` (`UUID` char(36) NOT NULL, `attachpoint` int(11) NOT NULL, `item` char(36) NOT NULL, `asset` char(36) NOT NULL) ENGINE=InnoDB;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
index bb58c39..9459e3e 100644
--- a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
@@ -3,25 +3,30 @@
 
 BEGIN;
 
-CREATE TABLE `xassetsmeta` (
-  `id` char(36) NOT NULL,
-  `hash` binary(32) NOT NULL,
-  `name` varchar(64) NOT NULL,
-  `description` varchar(64) NOT NULL,
-  `asset_type` tinyint(4) NOT NULL,
-  `local` tinyint(1) NOT NULL,
-  `temporary` tinyint(1) NOT NULL,
-  `create_time` int(11) NOT NULL,
-  `access_time` int(11) NOT NULL,
-  `asset_flags` int(11) NOT NULL,
-  `creator_id` varchar(128) NOT NULL,
+CREATE TABLE `XAssetsMeta` (
+  `ID` char(36) NOT NULL,
+  `Hash` binary(32) NOT NULL,
+  `Name` varchar(64) NOT NULL,
+  `Description` varchar(64) NOT NULL,
+  `AssetType` tinyint(4) NOT NULL,
+  `Local` tinyint(1) NOT NULL,
+  `Temporary` tinyint(1) NOT NULL,
+  `CreateTime` int(11) NOT NULL,
+  `AccessTime` int(11) NOT NULL,
+  `AssetFlags` int(11) NOT NULL,
+  `CreatorID` varchar(128) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
 
-CREATE TABLE `xassetsdata` (
-  `hash` binary(32) NOT NULL,
-  `data` longblob NOT NULL,
+CREATE TABLE `XAssetsData` (
+  `Hash` binary(32) NOT NULL,
+  `Data` longblob NOT NULL,
   PRIMARY KEY (`hash`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Version 1';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Version 1';
 
-COMMIT;
\ No newline at end of file
+COMMIT;
+
+:VERSION 2
+
+BEGIN;
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
new file mode 100644
index 0000000..9e6f1c1
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
@@ -0,0 +1,115 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE `os_groups_groups` (
+  `GroupID` char(36) NOT NULL default '',
+  `Location` varchar(255) NOT NULL default '',
+  `Name` varchar(255) NOT NULL default '',
+  `Charter` text NOT NULL,
+  `InsigniaID` char(36) NOT NULL default '',
+  `FounderID` char(36) NOT NULL default '',
+  `MembershipFee` int(11) NOT NULL default '0',
+  `OpenEnrollment` varchar(255) NOT NULL default '',
+  `ShowInList` int(4) NOT NULL default '0',
+  `AllowPublish` int(4) NOT NULL default '0',
+  `MaturePublish` int(4) NOT NULL default '0',
+  `OwnerRoleID` char(36) NOT NULL default '',
+  PRIMARY KEY  (`GroupID`),
+  UNIQUE KEY `Name` (`Name`),
+  FULLTEXT KEY `Name_2` (`Name`)
+) ENGINE=MyISAM;
+
+
+CREATE TABLE `os_groups_membership` (
+  `GroupID`char(36) NOT NULL default '',
+  `PrincipalID` VARCHAR(255) NOT NULL default '',
+  `SelectedRoleID` char(36) NOT NULL default '',
+  `Contribution` int(11) NOT NULL default '0',
+  `ListInProfile` int(4) NOT NULL default '1',
+  `AcceptNotices` int(4) NOT NULL default '1',
+  `AccessToken` char(36) NOT NULL default '',
+  PRIMARY KEY  (`GroupID`,`PrincipalID`),
+  KEY `PrincipalID` (`PrincipalID`)
+) ENGINE=MyISAM;
+
+
+CREATE TABLE `os_groups_roles` (
+  `GroupID` char(36) NOT NULL default '',
+  `RoleID` char(36) NOT NULL default '',
+  `Name` varchar(255) NOT NULL default '',
+  `Description` varchar(255) NOT NULL default '',
+  `Title` varchar(255) NOT NULL default '',
+  `Powers` bigint(20) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`GroupID`,`RoleID`),
+  KEY `GroupID` (`GroupID`)
+) ENGINE=MyISAM;
+
+
+CREATE TABLE `os_groups_rolemembership` (
+  `GroupID` char(36) NOT NULL default '',
+  `RoleID` char(36) NOT NULL default '',
+  `PrincipalID` VARCHAR(255) NOT NULL default '',
+  PRIMARY KEY  (`GroupID`,`RoleID`,`PrincipalID`),
+  KEY `PrincipalID` (`PrincipalID`)
+) ENGINE=MyISAM;
+
+
+CREATE TABLE `os_groups_invites` (
+  `InviteID` char(36) NOT NULL default '',
+  `GroupID` char(36) NOT NULL default '',
+  `RoleID` char(36) NOT NULL default '',
+  `PrincipalID` VARCHAR(255) NOT NULL default '',
+  `TMStamp` timestamp NOT NULL,
+  PRIMARY KEY  (`InviteID`),
+  UNIQUE KEY `PrincipalGroup` (`GroupID`,`PrincipalID`)
+) ENGINE=MyISAM;
+
+
+CREATE TABLE `os_groups_notices` (
+  `GroupID` char(36) NOT NULL default '',
+  `NoticeID` char(36) NOT NULL default '',
+  `TMStamp` int(10) unsigned NOT NULL default '0',
+  `FromName` varchar(255) NOT NULL default '',
+  `Subject` varchar(255) NOT NULL default '',
+  `Message` text NOT NULL,
+  `HasAttachment` int(4) NOT NULL default '0',
+  `AttachmentType` int(4) NOT NULL default '0',
+  `AttachmentName` varchar(128) NOT NULL default '',
+  `AttachmentItemID` char(36) NOT NULL default '',
+  `AttachmentOwnerID` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`NoticeID`),
+  KEY  `GroupID` (`GroupID`),
+  KEY `TMStamp` (`TMStamp`)
+) ENGINE=MyISAM;
+
+CREATE TABLE `os_groups_principals` (
+  `PrincipalID` VARCHAR(255) NOT NULL default '',
+  `ActiveGroupID` char(36) NOT NULL default '',
+  PRIMARY KEY  (`PrincipalID`)
+) ENGINE=MyISAM;
+
+COMMIT;
+
+:VERSION 2         # -------------------------- 
+
+BEGIN;
+
+INSERT INTO `os_groups_groups` SELECT * from `diva_groups_groups`;
+DROP TABLE `diva_groups_groups`;
+INSERT INTO `os_groups_membership` SELECT * from `diva_groups_membership`;
+DROP TABLE `diva_groups_membership`;
+INSERT INTO `os_groups_roles` SELECT * from `diva_groups_roles`;
+DROP TABLE `diva_groups_roles`;
+INSERT INTO `os_groups_rolemembership` SELECT * from `diva_groups_rolemembership`;
+DROP TABLE `diva_groups_rolemembership`;
+INSERT INTO `os_groups_invites` SELECT * from `diva_groups_invites`;
+DROP TABLE `diva_groups_invites`;
+INSERT INTO `os_groups_notices` SELECT * from `diva_groups_notices`;
+DROP TABLE `diva_groups_notices`;
+INSERT INTO `os_groups_principals` SELECT * from `diva_groups_principals`;
+DROP TABLE `diva_groups_principals`;
+
+DELETE FROM `migrations` WHERE name='diva_im_Store';
+
+COMMIT;
\ No newline at end of file