aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteEstateData.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-01 02:14:34 +0000
committerMelanie Thielker2008-08-01 02:14:34 +0000
commit43f3b9ad7b24cbd4c020c36e1cf5133e09a66c8f (patch)
treedceb99df2502dec060bcbb139597110910039443 /OpenSim/Data/SQLite/SQLiteEstateData.cs
parentThanks, Zaki, for a patch that addresses unhandled exceptions in the (diff)
downloadopensim-SC_OLD-43f3b9ad7b24cbd4c020c36e1cf5133e09a66c8f.zip
opensim-SC_OLD-43f3b9ad7b24cbd4c020c36e1cf5133e09a66c8f.tar.gz
opensim-SC_OLD-43f3b9ad7b24cbd4c020c36e1cf5133e09a66c8f.tar.bz2
opensim-SC_OLD-43f3b9ad7b24cbd4c020c36e1cf5133e09a66c8f.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs7
1 files changed, 7 insertions, 0 deletions
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
109 else 109 else
110 m_FieldMap[name].SetValue(es, false); 110 m_FieldMap[name].SetValue(es, false);
111 } 111 }
112 else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
113 {
114 LLUUID uuid = LLUUID.Zero;
115
116 LLUUID.TryParse(r[name].ToString(), out uuid);
117 m_FieldMap[name].SetValue(es, uuid);
118 }
112 else 119 else
113 { 120 {
114 m_FieldMap[name].SetValue(es, Convert.ChangeType(r[name], m_FieldMap[name].FieldType)); 121 m_FieldMap[name].SetValue(es, Convert.ChangeType(r[name], m_FieldMap[name].FieldType));