aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
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
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')
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs7
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs7
-rw-r--r--OpenSim/Framework/EstateSettings.cs16
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
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]);
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));
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
215 set { m_PublicAccess = value; } 215 set { m_PublicAccess = value; }
216 } 216 }
217 217
218 private string m_AbuseEmail = String.Empty;
219
220 public string AbuseEmail
221 {
222 get { return m_AbuseEmail; }
223 set { m_AbuseEmail= value; }
224 }
225
226 private LLUUID m_EstateOwner = LLUUID.Zero;
227
228 public LLUUID EstateOwner
229 {
230 get { return m_EstateOwner; }
231 set { m_EstateOwner = value; }
232 }
233
218 // All those lists... 234 // All those lists...
219 // 235 //
220 private List<LLUUID> l_EstateManagers = new List<LLUUID>(); 236 private List<LLUUID> l_EstateManagers = new List<LLUUID>();