7 files changed, 225 insertions, 225 deletions

diff --git a/OpenSim/Data/NHibernate/Resources/EstateRegionLink.hbm.xml b/OpenSim/Data/NHibernate/Resources/EstateRegionLink.hbm.xml
index 91bddee..fd66910 100644
--- a/OpenSim/Data/NHibernate/Resources/EstateRegionLink.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/EstateRegionLink.hbm.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>

-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">

-    <class name="OpenSim.Data.NHibernate.EstateRegionLink, OpenSim.Data.NHibernate" table="EstateRegionLink" lazy="false">

-      <id name="EstateRegionLinkID" column="EstateRegionLinkID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 

-          <generator class="assigned" /> 

-        </id>

-

-        <property name="EstateID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />

-        <property name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />

-      

-    </class>

-</hibernate-mapping>

+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="OpenSim.Data.NHibernate.EstateRegionLink, OpenSim.Data.NHibernate" table="EstateRegionLink" lazy="false">
+      <id name="EstateRegionLinkID" column="EstateRegionLinkID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> 
+          <generator class="assigned" /> 
+        </id>
+
+        <property name="EstateID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
+        <property name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+      
+    </class>
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml b/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
index 1ff0f10..2dc3949 100644
--- a/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/EstateSettings.hbm.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8" ?>

-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">

-    <class name="OpenSim.Framework.EstateSettings, OpenSim.Framework" table="EstateSettings" lazy="false">

-        

-        <id name="EstateID" column="EstateID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate"> 

-          <generator class="increment" /> 

-        </id>

-

-        <property name="ParentEstateID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />

-        <property name="EstateOwner" column="EstateOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />

-        

-        <property name="EstateName" column="Name" type="String" length="64" />

-

-        <property name="RedirectGridX" type="System.Int32" />

-        <property name="RedirectGridY" type="System.Int32" />

-

-        <property name="BillableFactor" type="System.Single" />

-        <property name="PricePerMeter" type="System.Int32" />                

-        <property name="SunPosition" type="System.Double" />

-

-        <property name="UseGlobalTime" type="System.Boolean" />

-        <property name="FixedSun" type="System.Boolean" />

-        <property name="AllowVoice" type="System.Boolean" />

-        <property name="AllowDirectTeleport" type="System.Boolean" />

-        <property name="ResetHomeOnTeleport" type="System.Boolean" />

-        <property name="PublicAccess" type="System.Boolean" />

-        <property name="DenyAnonymous" type="System.Boolean" />

-        <property name="DenyIdentified" type="System.Boolean" />

-        <property name="DenyTransacted" type="System.Boolean" />

-        <property name="DenyMinors" type="System.Boolean" />

-        <property name="BlockDwell" type="System.Boolean" />

-        <property name="EstateSkipScripts" type="System.Boolean" />

-        <property name="TaxFree" type="System.Boolean" />

-        <property name="AbuseEmailToEstateOwner" type="System.Boolean" />

-      

-        <property name="AbuseEmail" type="String" length="255" />

-

-    </class>

-</hibernate-mapping>

+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+    <class name="OpenSim.Framework.EstateSettings, OpenSim.Framework" table="EstateSettings" lazy="false">
+        
+        <id name="EstateID" column="EstateID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate"> 
+          <generator class="increment" /> 
+        </id>
+
+        <property name="ParentEstateID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
+        <property name="EstateOwner" column="EstateOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
+        
+        <property name="EstateName" column="Name" type="String" length="64" />
+
+        <property name="RedirectGridX" type="System.Int32" />
+        <property name="RedirectGridY" type="System.Int32" />
+
+        <property name="BillableFactor" type="System.Single" />
+        <property name="PricePerMeter" type="System.Int32" />                
+        <property name="SunPosition" type="System.Double" />
+
+        <property name="UseGlobalTime" type="System.Boolean" />
+        <property name="FixedSun" type="System.Boolean" />
+        <property name="AllowVoice" type="System.Boolean" />
+        <property name="AllowDirectTeleport" type="System.Boolean" />
+        <property name="ResetHomeOnTeleport" type="System.Boolean" />
+        <property name="PublicAccess" type="System.Boolean" />
+        <property name="DenyAnonymous" type="System.Boolean" />
+        <property name="DenyIdentified" type="System.Boolean" />
+        <property name="DenyTransacted" type="System.Boolean" />
+        <property name="DenyMinors" type="System.Boolean" />
+        <property name="BlockDwell" type="System.Boolean" />
+        <property name="EstateSkipScripts" type="System.Boolean" />
+        <property name="TaxFree" type="System.Boolean" />
+        <property name="AbuseEmailToEstateOwner" type="System.Boolean" />
+      
+        <property name="AbuseEmail" type="String" length="255" />
+
+    </class>
+</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/MigrationSyntaxDifferences.txt b/OpenSim/Data/NHibernate/Resources/MigrationSyntaxDifferences.txt
index f3d86df..1c89516 100644
--- a/OpenSim/Data/NHibernate/Resources/MigrationSyntaxDifferences.txt
+++ b/OpenSim/Data/NHibernate/Resources/MigrationSyntaxDifferences.txt
@@ -1,14 +1,14 @@
-?This file describes the differences in schema creation and migration scripts.

-

-MySQL is used as reference script against which differences are listed.

-

-Generally MySQL create table options should be removed for other databases.

-

-_PostgreSQL_

-* DOUBLE->DOUBLE PRECISION

-* BIT->BOOLEAN

-

-_MsSql_

-* VARCHAR->NVARCHAR

-* Remove DEFAULT-keywords

-* DOUBLE->REAL

+?This file describes the differences in schema creation and migration scripts.
+
+MySQL is used as reference script against which differences are listed.
+
+Generally MySQL create table options should be removed for other databases.
+
+_PostgreSQL_
+* DOUBLE->DOUBLE PRECISION
+* BIT->BOOLEAN
+
+_MsSql_
+* VARCHAR->NVARCHAR
+* Remove DEFAULT-keywords
+* DOUBLE->REAL
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
index 0e95963..4ca51be 100644
--- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_EstateStore.sql
@@ -1,40 +1,40 @@
-CREATE TABLE EstateSettings (

-  EstateID INT NOT NULL,

-  ParentEstateID INT NULL,

-  EstateOwnerID NVARCHAR(36) NULL,

-  Name NVARCHAR(64) NULL,

-  RedirectGridX INT NULL,

-  RedirectGridY INT NULL,

-  BillableFactor REAL NULL,

-  PricePerMeter INT NULL,

-  SunPosition FLOAT NULL,

-  

-  UseGlobalTime BIT NULL,

-  FixedSun BIT NULL,

-  AllowVoice BIT NULL,

-  AllowDirectTeleport BIT NULL,

-  ResetHomeOnTeleport BIT NULL,

-  PublicAccess BIT NULL,

-  DenyAnonymous BIT NULL,

-  DenyIdentified BIT NULL,

-  DenyTransacted BIT NULL,

-  DenyMinors BIT NULL,

-  BlockDwell BIT NULL,

-  EstateSkipScripts BIT NULL,

-  TaxFree BIT NULL,

-  AbuseEmailToEstateOwner BIT NULL,

-  

-  AbuseEmail NVARCHAR(255) NULL,

-

-  PRIMARY KEY (EstateID)

-);

-

-CREATE TABLE EstateRegionLink (

-  EstateRegionLinkID NVARCHAR(36) NOT NULL,

-  EstateID INT NULL,

-  RegionID NVARCHAR(36) NULL,

-  PRIMARY KEY (EstateRegionLinkID)

-);

-

-CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);

-CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);

+CREATE TABLE EstateSettings (
+  EstateID INT NOT NULL,
+  ParentEstateID INT NULL,
+  EstateOwnerID NVARCHAR(36) NULL,
+  Name NVARCHAR(64) NULL,
+  RedirectGridX INT NULL,
+  RedirectGridY INT NULL,
+  BillableFactor REAL NULL,
+  PricePerMeter INT NULL,
+  SunPosition FLOAT NULL,
+  
+  UseGlobalTime BIT NULL,
+  FixedSun BIT NULL,
+  AllowVoice BIT NULL,
+  AllowDirectTeleport BIT NULL,
+  ResetHomeOnTeleport BIT NULL,
+  PublicAccess BIT NULL,
+  DenyAnonymous BIT NULL,
+  DenyIdentified BIT NULL,
+  DenyTransacted BIT NULL,
+  DenyMinors BIT NULL,
+  BlockDwell BIT NULL,
+  EstateSkipScripts BIT NULL,
+  TaxFree BIT NULL,
+  AbuseEmailToEstateOwner BIT NULL,
+  
+  AbuseEmail NVARCHAR(255) NULL,
+
+  PRIMARY KEY (EstateID)
+);
+
+CREATE TABLE EstateRegionLink (
+  EstateRegionLinkID NVARCHAR(36) NOT NULL,
+  EstateID INT NULL,
+  RegionID NVARCHAR(36) NULL,
+  PRIMARY KEY (EstateRegionLinkID)
+);
+
+CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
+CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
index a791bc6..2114186 100644
--- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_EstateStore.sql
@@ -1,40 +1,40 @@
-CREATE TABLE EstateSettings (

-  EstateID INT NOT NULL,

-  ParentEstateID INT DEFAULT NULL,

-  EstateOwnerID VARCHAR(36) DEFAULT NULL,

-  Name VARCHAR(64) DEFAULT NULL,

-  RedirectGridX INT DEFAULT NULL,

-  RedirectGridY INT DEFAULT NULL,

-  BillableFactor DOUBLE DEFAULT NULL,

-  PricePerMeter INT DEFAULT NULL,

-  SunPosition DOUBLE DEFAULT NULL,

-  

-  UseGlobalTime BIT DEFAULT NULL,

-  FixedSun BIT DEFAULT NULL,

-  AllowVoice BIT DEFAULT NULL,

-  AllowDirectTeleport BIT DEFAULT NULL,

-  ResetHomeOnTeleport BIT DEFAULT NULL,

-  PublicAccess BIT DEFAULT NULL,

-  DenyAnonymous BIT DEFAULT NULL,

-  DenyIdentified BIT DEFAULT NULL,

-  DenyTransacted BIT DEFAULT NULL,

-  DenyMinors BIT DEFAULT NULL,

-  BlockDwell BIT DEFAULT NULL,

-  EstateSkipScripts BIT DEFAULT NULL,

-  TaxFree BIT DEFAULT NULL,

-  AbuseEmailToEstateOwner BIT DEFAULT NULL,

-  

-  AbuseEmail VARCHAR(255) DEFAULT NULL,

-

-  PRIMARY KEY (EstateID)

-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';

-

-CREATE TABLE EstateRegionLink (

-  EstateRegionLinkID VARCHAR(36) NOT NULL,

-  EstateID INT DEFAULT NULL,

-  RegionID VARCHAR(36) DEFAULT NULL,

-  PRIMARY KEY (EstateRegionLinkID)

-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';

-

-CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);

-CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);

+CREATE TABLE EstateSettings (
+  EstateID INT NOT NULL,
+  ParentEstateID INT DEFAULT NULL,
+  EstateOwnerID VARCHAR(36) DEFAULT NULL,
+  Name VARCHAR(64) DEFAULT NULL,
+  RedirectGridX INT DEFAULT NULL,
+  RedirectGridY INT DEFAULT NULL,
+  BillableFactor DOUBLE DEFAULT NULL,
+  PricePerMeter INT DEFAULT NULL,
+  SunPosition DOUBLE DEFAULT NULL,
+  
+  UseGlobalTime BIT DEFAULT NULL,
+  FixedSun BIT DEFAULT NULL,
+  AllowVoice BIT DEFAULT NULL,
+  AllowDirectTeleport BIT DEFAULT NULL,
+  ResetHomeOnTeleport BIT DEFAULT NULL,
+  PublicAccess BIT DEFAULT NULL,
+  DenyAnonymous BIT DEFAULT NULL,
+  DenyIdentified BIT DEFAULT NULL,
+  DenyTransacted BIT DEFAULT NULL,
+  DenyMinors BIT DEFAULT NULL,
+  BlockDwell BIT DEFAULT NULL,
+  EstateSkipScripts BIT DEFAULT NULL,
+  TaxFree BIT DEFAULT NULL,
+  AbuseEmailToEstateOwner BIT DEFAULT NULL,
+  
+  AbuseEmail VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (EstateID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+
+CREATE TABLE EstateRegionLink (
+  EstateRegionLinkID VARCHAR(36) NOT NULL,
+  EstateID INT DEFAULT NULL,
+  RegionID VARCHAR(36) DEFAULT NULL,
+  PRIMARY KEY (EstateRegionLinkID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+
+CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
+CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
index 421a0c4..e43fd86 100644
--- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_EstateStore.sql
@@ -1,40 +1,40 @@
-CREATE TABLE EstateSettings (

-  EstateID INT NOT NULL,

-  ParentEstateID INT DEFAULT NULL,

-  EstateOwnerID VARCHAR(36) DEFAULT NULL,

-  Name VARCHAR(64) DEFAULT NULL,

-  RedirectGridX INT DEFAULT NULL,

-  RedirectGridY INT DEFAULT NULL,

-  BillableFactor DOUBLE PRECISION DEFAULT NULL,

-  PricePerMeter INT DEFAULT NULL,

-  SunPosition DOUBLE PRECISION DEFAULT NULL,

-  

-  UseGlobalTime BOOLEAN DEFAULT NULL,

-  FixedSun BOOLEAN DEFAULT NULL,

-  AllowVoice BOOLEAN DEFAULT NULL,

-  AllowDirectTeleport BOOLEAN DEFAULT NULL,

-  ResetHomeOnTeleport BOOLEAN DEFAULT NULL,

-  PublicAccess BOOLEAN DEFAULT NULL,

-  DenyAnonymous BOOLEAN DEFAULT NULL,

-  DenyIdentified BOOLEAN DEFAULT NULL,

-  DenyTransacted BOOLEAN DEFAULT NULL,

-  DenyMinors BOOLEAN DEFAULT NULL,

-  BlockDwell BOOLEAN DEFAULT NULL,

-  EstateSkipScripts BOOLEAN DEFAULT NULL,

-  TaxFree BOOLEAN DEFAULT NULL,

-  AbuseEmailToEstateOwner BOOLEAN DEFAULT NULL,

-  

-  AbuseEmail VARCHAR(255) DEFAULT NULL,

-

-  PRIMARY KEY (EstateID)

-);

-

-CREATE TABLE EstateRegionLink (

-  EstateRegionLinkID VARCHAR(36) NOT NULL,

-  EstateID INT DEFAULT NULL,

-  RegionID VARCHAR(36) DEFAULT NULL,

-  PRIMARY KEY (EstateRegionLinkID)

-);

-

-CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);

-CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);

+CREATE TABLE EstateSettings (
+  EstateID INT NOT NULL,
+  ParentEstateID INT DEFAULT NULL,
+  EstateOwnerID VARCHAR(36) DEFAULT NULL,
+  Name VARCHAR(64) DEFAULT NULL,
+  RedirectGridX INT DEFAULT NULL,
+  RedirectGridY INT DEFAULT NULL,
+  BillableFactor DOUBLE PRECISION DEFAULT NULL,
+  PricePerMeter INT DEFAULT NULL,
+  SunPosition DOUBLE PRECISION DEFAULT NULL,
+  
+  UseGlobalTime BOOLEAN DEFAULT NULL,
+  FixedSun BOOLEAN DEFAULT NULL,
+  AllowVoice BOOLEAN DEFAULT NULL,
+  AllowDirectTeleport BOOLEAN DEFAULT NULL,
+  ResetHomeOnTeleport BOOLEAN DEFAULT NULL,
+  PublicAccess BOOLEAN DEFAULT NULL,
+  DenyAnonymous BOOLEAN DEFAULT NULL,
+  DenyIdentified BOOLEAN DEFAULT NULL,
+  DenyTransacted BOOLEAN DEFAULT NULL,
+  DenyMinors BOOLEAN DEFAULT NULL,
+  BlockDwell BOOLEAN DEFAULT NULL,
+  EstateSkipScripts BOOLEAN DEFAULT NULL,
+  TaxFree BOOLEAN DEFAULT NULL,
+  AbuseEmailToEstateOwner BOOLEAN DEFAULT NULL,
+  
+  AbuseEmail VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (EstateID)
+);
+
+CREATE TABLE EstateRegionLink (
+  EstateRegionLinkID VARCHAR(36) NOT NULL,
+  EstateID INT DEFAULT NULL,
+  RegionID VARCHAR(36) DEFAULT NULL,
+  PRIMARY KEY (EstateRegionLinkID)
+);
+
+CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
+CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
index b16ae82..b540bc6 100644
--- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
+++ b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_EstateStore.sql
@@ -1,40 +1,40 @@
-CREATE TABLE EstateSettings (

-  EstateID INT NOT NULL,

-  ParentEstateID INT DEFAULT NULL,

-  EstateOwnerID VARCHAR(36) DEFAULT NULL,

-  Name VARCHAR(64) DEFAULT NULL,

-  RedirectGridX INT DEFAULT NULL,

-  RedirectGridY INT DEFAULT NULL,

-  BillableFactor DOUBLE DEFAULT NULL,

-  PricePerMeter INT DEFAULT NULL,

-  SunPosition DOUBLE DEFAULT NULL,

-  

-  UseGlobalTime BIT DEFAULT NULL,

-  FixedSun BIT DEFAULT NULL,

-  AllowVoice BIT DEFAULT NULL,

-  AllowDirectTeleport BIT DEFAULT NULL,

-  ResetHomeOnTeleport BIT DEFAULT NULL,

-  PublicAccess BIT DEFAULT NULL,

-  DenyAnonymous BIT DEFAULT NULL,

-  DenyIdentified BIT DEFAULT NULL,

-  DenyTransacted BIT DEFAULT NULL,

-  DenyMinors BIT DEFAULT NULL,

-  BlockDwell BIT DEFAULT NULL,

-  EstateSkipScripts BIT DEFAULT NULL,

-  TaxFree BIT DEFAULT NULL,

-  AbuseEmailToEstateOwner BIT DEFAULT NULL,

-  

-  AbuseEmail VARCHAR(255) DEFAULT NULL,

-

-  PRIMARY KEY (EstateID)

-);

-

-CREATE TABLE EstateRegionLink (

-  EstateRegionLinkID VARCHAR(36) NOT NULL,

-  EstateID INT DEFAULT NULL,

-  RegionID VARCHAR(36) DEFAULT NULL,

-  PRIMARY KEY (EstateRegionLinkID)

-);

-

-CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);

-CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);

+CREATE TABLE EstateSettings (
+  EstateID INT NOT NULL,
+  ParentEstateID INT DEFAULT NULL,
+  EstateOwnerID VARCHAR(36) DEFAULT NULL,
+  Name VARCHAR(64) DEFAULT NULL,
+  RedirectGridX INT DEFAULT NULL,
+  RedirectGridY INT DEFAULT NULL,
+  BillableFactor DOUBLE DEFAULT NULL,
+  PricePerMeter INT DEFAULT NULL,
+  SunPosition DOUBLE DEFAULT NULL,
+  
+  UseGlobalTime BIT DEFAULT NULL,
+  FixedSun BIT DEFAULT NULL,
+  AllowVoice BIT DEFAULT NULL,
+  AllowDirectTeleport BIT DEFAULT NULL,
+  ResetHomeOnTeleport BIT DEFAULT NULL,
+  PublicAccess BIT DEFAULT NULL,
+  DenyAnonymous BIT DEFAULT NULL,
+  DenyIdentified BIT DEFAULT NULL,
+  DenyTransacted BIT DEFAULT NULL,
+  DenyMinors BIT DEFAULT NULL,
+  BlockDwell BIT DEFAULT NULL,
+  EstateSkipScripts BIT DEFAULT NULL,
+  TaxFree BIT DEFAULT NULL,
+  AbuseEmailToEstateOwner BIT DEFAULT NULL,
+  
+  AbuseEmail VARCHAR(255) DEFAULT NULL,
+
+  PRIMARY KEY (EstateID)
+);
+
+CREATE TABLE EstateRegionLink (
+  EstateRegionLinkID VARCHAR(36) NOT NULL,
+  EstateID INT DEFAULT NULL,
+  RegionID VARCHAR(36) DEFAULT NULL,
+  PRIMARY KEY (EstateRegionLinkID)
+);
+
+CREATE INDEX EstateRegionLinkEstateIDIndex ON EstateRegionLink (EstateID);
+CREATE INDEX EstateRegionLinkERegionIDIndex ON EstateRegionLink (RegionID);