aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLEstateData.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/MySQL/MySQLEstateData.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 'OpenSim/Data/MySQL/MySQLEstateData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs7
1 files changed, 7 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
185 else 185 else
186 m_FieldMap[name].SetValue(es, false); 186 m_FieldMap[name].SetValue(es, false);
187 } 187 }
188 else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
189 {
190 LLUUID uuid = LLUUID.Zero;
191
192 LLUUID.TryParse(r[name].ToString(), out uuid);
193 m_FieldMap[name].SetValue(es, uuid);
194 }
188 else 195 else
189 { 196 {
190 m_FieldMap[name].SetValue(es, r[name]); 197 m_FieldMap[name].SetValue(es, r[name]);