Patch #8 in the estate series. Introduces the concept of an estate

owner (alongside the master avatar) and provides storage fo the
abuse email address. No user functionality yet.
This patch includes a migration.

3 files changed, 30 insertions, 0 deletions

diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 78d4446..e843457 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -185,6 +185,13 @@ namespace OpenSim.Data.MySQL
                         else
                             m_FieldMap[name].SetValue(es, false);
                     }
+                    else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
+                    {
+                        LLUUID uuid = LLUUID.Zero;
+
+                        LLUUID.TryParse(r[name].ToString(), out uuid);
+                        m_FieldMap[name].SetValue(es, uuid);
+                    }
                     else
                     {
                         m_FieldMap[name].SetValue(es, r[name]);
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 93d86b6..092f4d5 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -109,6 +109,13 @@ namespace OpenSim.Data.SQLite
                         else
                             m_FieldMap[name].SetValue(es, false);
                     }
+                    else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
+                    {
+                        LLUUID uuid = LLUUID.Zero;
+
+                        LLUUID.TryParse(r[name].ToString(), out uuid);
+                        m_FieldMap[name].SetValue(es, uuid);
+                    }
                     else
                     {
                         m_FieldMap[name].SetValue(es, Convert.ChangeType(r[name], m_FieldMap[name].FieldType));
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 38c7bc3..31655f4 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -215,6 +215,22 @@ namespace OpenSim.Framework
             set { m_PublicAccess = value; }
         }
 
+        private string m_AbuseEmail = String.Empty;
+
+        public string AbuseEmail
+        {
+            get { return m_AbuseEmail; }
+            set { m_AbuseEmail= value; }
+        }
+
+        private LLUUID m_EstateOwner = LLUUID.Zero;
+
+        public LLUUID EstateOwner
+        {
+            get { return m_EstateOwner; }
+            set { m_EstateOwner = value; }
+        }
+
         // All those lists...
         //
         private List<LLUUID> l_EstateManagers = new List<LLUUID>();