aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL/MSSQLEstateData.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLEstateData.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 74eecd8..b42c67f 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces; 36using OpenSim.Region.Environment.Interfaces;
@@ -102,7 +102,7 @@ namespace OpenSim.Data.MSSQL
102 /// </summary> 102 /// </summary>
103 /// <param name="regionID">region ID.</param> 103 /// <param name="regionID">region ID.</param>
104 /// <returns></returns> 104 /// <returns></returns>
105 public EstateSettings LoadEstateSettings(LLUUID regionID) 105 public EstateSettings LoadEstateSettings(UUID regionID)
106 { 106 {
107 EstateSettings es = new EstateSettings(); 107 EstateSettings es = new EstateSettings();
108 108
@@ -128,10 +128,10 @@ namespace OpenSim.Data.MSSQL
128 else 128 else
129 _FieldMap[name].SetValue(es, false); 129 _FieldMap[name].SetValue(es, false);
130 } 130 }
131 else if (_FieldMap[name].GetValue(es) is LLUUID) 131 else if (_FieldMap[name].GetValue(es) is UUID)
132 { 132 {
133 LLUUID uuid; 133 UUID uuid;
134 LLUUID.TryParse(reader[name].ToString(), out uuid); 134 UUID.TryParse(reader[name].ToString(), out uuid);
135 135
136 _FieldMap[name].SetValue(es, uuid); 136 _FieldMap[name].SetValue(es, uuid);
137 } 137 }
@@ -333,8 +333,8 @@ namespace OpenSim.Data.MSSQL
333 { 333 {
334 EstateBan eb = new EstateBan(); 334 EstateBan eb = new EstateBan();
335 335
336 LLUUID uuid; 336 UUID uuid;
337 LLUUID.TryParse(reader["bannedUUID"].ToString(), out uuid); 337 UUID.TryParse(reader["bannedUUID"].ToString(), out uuid);
338 338
339 eb.bannedUUID = uuid; 339 eb.bannedUUID = uuid;
340 eb.bannedIP = "0.0.0.0"; 340 eb.bannedIP = "0.0.0.0";
@@ -345,9 +345,9 @@ namespace OpenSim.Data.MSSQL
345 } 345 }
346 } 346 }
347 347
348 private LLUUID[] LoadUUIDList(uint estateID, string table) 348 private UUID[] LoadUUIDList(uint estateID, string table)
349 { 349 {
350 List<LLUUID> uuids = new List<LLUUID>(); 350 List<UUID> uuids = new List<UUID>();
351 351
352 string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table); 352 string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table);
353 353
@@ -361,8 +361,8 @@ namespace OpenSim.Data.MSSQL
361 { 361 {
362 // EstateBan eb = new EstateBan(); 362 // EstateBan eb = new EstateBan();
363 363
364 LLUUID uuid; 364 UUID uuid;
365 LLUUID.TryParse(reader["uuid"].ToString(), out uuid); 365 UUID.TryParse(reader["uuid"].ToString(), out uuid);
366 366
367 uuids.Add(uuid); 367 uuids.Add(uuid);
368 } 368 }
@@ -399,7 +399,7 @@ namespace OpenSim.Data.MSSQL
399 } 399 }
400 } 400 }
401 401
402 private void SaveUUIDList(uint estateID, string table, LLUUID[] data) 402 private void SaveUUIDList(uint estateID, string table, UUID[] data)
403 { 403 {
404 //Delete first 404 //Delete first
405 string sql = string.Format("delete from {0} where EstateID = @EstateID", table); 405 string sql = string.Format("delete from {0} where EstateID = @EstateID", table);
@@ -416,7 +416,7 @@ namespace OpenSim.Data.MSSQL
416 416
417 bool createParamOnce = true; 417 bool createParamOnce = true;
418 418
419 foreach (LLUUID uuid in data) 419 foreach (UUID uuid in data)
420 { 420 {
421 if (createParamOnce) 421 if (createParamOnce)
422 { 422 {