2 files changed, 14 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));