Merge branch 'switch' into Domme.

1 files changed, 13 insertions, 6 deletions

diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
index 9c1ed83..87adcca 100644
--- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -6,20 +6,20 @@ CREATE TABLE IF NOT EXISTS `estate_groups` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `estate_managers` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 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 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `estate_settings` (
   `EstateID` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -50,13 +50,13 @@ CREATE TABLE IF NOT EXISTS `estate_settings` (
   `AllowParcelChanges` tinyint(4) NOT NULL DEFAULT '1',
   `AllowSetHome` tinyint(4) NOT NULL DEFAULT '1',
   PRIMARY KEY (`EstateID`)
-) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `estate_users` (
   `EstateID` int(10) unsigned NOT NULL,
   `uuid` char(36) NOT NULL,
   KEY `EstateID` (`EstateID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `estateban` (
   `EstateID` int(10) unsigned NOT NULL,
@@ -65,7 +65,14 @@ CREATE TABLE IF NOT EXISTS `estateban` (
   `bannedIpHostMask` varchar(16) NOT NULL,
   `bannedNameMask` varchar(64) DEFAULT NULL,
   KEY `estateban_EstateID` (`EstateID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 COMMIT;
 
+:VERSION 35
+BEGIN;
+ALTER TABLE `estateban`
+    ADD COLUMN `banningUUID` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    ADD COLUMN `banTime` int(11) NOT NULL DEFAULT 0;
+COMMIT;
+