aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLEstateData.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLEstateData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 2ab7d40..8eddec6 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -157,7 +157,7 @@ namespace OpenSim.Data.MySQL
157 m_lastConnectionUse = timeNow; 157 m_lastConnectionUse = timeNow;
158 } 158 }
159 159
160 public EstateSettings LoadEstateSettings(LLUUID regionID) 160 public EstateSettings LoadEstateSettings(UUID regionID)
161 { 161 {
162 EstateSettings es = new EstateSettings(); 162 EstateSettings es = new EstateSettings();
163 es.OnSave += StoreEstateSettings; 163 es.OnSave += StoreEstateSettings;
@@ -185,11 +185,11 @@ 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) 188 else if(m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
189 { 189 {
190 LLUUID uuid = LLUUID.Zero; 190 UUID uuid = UUID.Zero;
191 191
192 LLUUID.TryParse(r[name].ToString(), out uuid); 192 UUID.TryParse(r[name].ToString(), out uuid);
193 m_FieldMap[name].SetValue(es, uuid); 193 m_FieldMap[name].SetValue(es, uuid);
194 } 194 }
195 else 195 else
@@ -330,8 +330,8 @@ namespace OpenSim.Data.MySQL
330 { 330 {
331 EstateBan eb = new EstateBan(); 331 EstateBan eb = new EstateBan();
332 332
333 LLUUID uuid = new LLUUID(); 333 UUID uuid = new UUID();
334 LLUUID.TryParse(r["bannedUUID"].ToString(), out uuid); 334 UUID.TryParse(r["bannedUUID"].ToString(), out uuid);
335 335
336 eb.bannedUUID = uuid; 336 eb.bannedUUID = uuid;
337 eb.bannedIP = "0.0.0.0"; 337 eb.bannedIP = "0.0.0.0";
@@ -366,7 +366,7 @@ namespace OpenSim.Data.MySQL
366 } 366 }
367 } 367 }
368 368
369 void SaveUUIDList(uint EstateID, string table, LLUUID[] data) 369 void SaveUUIDList(uint EstateID, string table, UUID[] data)
370 { 370 {
371 CheckConnection(); 371 CheckConnection();
372 372
@@ -381,7 +381,7 @@ namespace OpenSim.Data.MySQL
381 381
382 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( ?EstateID, ?uuid )"; 382 cmd.CommandText = "insert into "+table+" (EstateID, uuid) values ( ?EstateID, ?uuid )";
383 383
384 foreach (LLUUID uuid in data) 384 foreach (UUID uuid in data)
385 { 385 {
386 cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString()); 386 cmd.Parameters.AddWithValue("?EstateID", EstateID.ToString());
387 cmd.Parameters.AddWithValue("?uuid", uuid.ToString()); 387 cmd.Parameters.AddWithValue("?uuid", uuid.ToString());
@@ -391,9 +391,9 @@ namespace OpenSim.Data.MySQL
391 } 391 }
392 } 392 }
393 393
394 LLUUID[] LoadUUIDList(uint EstateID, string table) 394 UUID[] LoadUUIDList(uint EstateID, string table)
395 { 395 {
396 List<LLUUID> uuids = new List<LLUUID>(); 396 List<UUID> uuids = new List<UUID>();
397 397
398 CheckConnection(); 398 CheckConnection();
399 399
@@ -408,8 +408,8 @@ namespace OpenSim.Data.MySQL
408 { 408 {
409 // EstateBan eb = new EstateBan(); 409 // EstateBan eb = new EstateBan();
410 410
411 LLUUID uuid = new LLUUID(); 411 UUID uuid = new UUID();
412 LLUUID.TryParse(r["uuid"].ToString(), out uuid); 412 UUID.TryParse(r["uuid"].ToString(), out uuid);
413 413
414 uuids.Add(uuid); 414 uuids.Add(uuid);
415 } 415 }