From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * This is the fabled LibOMV update with all of the libOMV types from
 JHurliman * This is a HUGE OMG update and will definitely have unknown side
 effects.. so this is really only for the strong hearted at this point. 
 Regular people should let the dust settle. * This has been tested to work
 with most basic functions. However..   make sure you back up 'everything'
 before using this.  It's that big! * Essentially we're back at square 1 in
 the testing phase..  so lets identify things that broke.

---
 OpenSim/Data/MSSQL/MSSQLEstateData.cs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Data/MSSQL/MSSQLEstateData.cs')

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;
 using System.Data;
 using System.Data.SqlClient;
 using System.Reflection;
-using libsecondlife;
+using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
@@ -102,7 +102,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="regionID">region ID.</param>
         /// <returns></returns>
-        public EstateSettings LoadEstateSettings(LLUUID regionID)
+        public EstateSettings LoadEstateSettings(UUID regionID)
         {
             EstateSettings es = new EstateSettings();
 
@@ -128,10 +128,10 @@ namespace OpenSim.Data.MSSQL
                                 else
                                     _FieldMap[name].SetValue(es, false);
                             }
-                            else if (_FieldMap[name].GetValue(es) is LLUUID)
+                            else if (_FieldMap[name].GetValue(es) is UUID)
                             {
-                                LLUUID uuid;
-                                LLUUID.TryParse(reader[name].ToString(), out uuid);
+                                UUID uuid;
+                                UUID.TryParse(reader[name].ToString(), out uuid);
 
                                 _FieldMap[name].SetValue(es, uuid);
                             }
@@ -333,8 +333,8 @@ namespace OpenSim.Data.MSSQL
                     {
                         EstateBan eb = new EstateBan();
 
-                        LLUUID uuid;
-                        LLUUID.TryParse(reader["bannedUUID"].ToString(), out uuid);
+                        UUID uuid;
+                        UUID.TryParse(reader["bannedUUID"].ToString(), out uuid);
 
                         eb.bannedUUID = uuid;
                         eb.bannedIP = "0.0.0.0";
@@ -345,9 +345,9 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
-        private LLUUID[] LoadUUIDList(uint estateID, string table)
+        private UUID[] LoadUUIDList(uint estateID, string table)
         {
-            List<LLUUID> uuids = new List<LLUUID>();
+            List<UUID> uuids = new List<UUID>();
 
             string sql = string.Format("select uuid from {0} where EstateID = @EstateID", table);
 
@@ -361,8 +361,8 @@ namespace OpenSim.Data.MSSQL
                     {
                         // EstateBan eb = new EstateBan();
 
-                        LLUUID uuid;
-                        LLUUID.TryParse(reader["uuid"].ToString(), out uuid);
+                        UUID uuid;
+                        UUID.TryParse(reader["uuid"].ToString(), out uuid);
 
                         uuids.Add(uuid);
                     }
@@ -399,7 +399,7 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
-        private void SaveUUIDList(uint estateID, string table, LLUUID[] data)
+        private void SaveUUIDList(uint estateID, string table, UUID[] data)
         {
             //Delete first
             string sql = string.Format("delete from {0} where EstateID = @EstateID", table);
@@ -416,7 +416,7 @@ namespace OpenSim.Data.MSSQL
 
                 bool createParamOnce = true;
 
-                foreach (LLUUID uuid in data)
+                foreach (UUID uuid in data)
                 {
                     if (createParamOnce)
                     {
-- 
cgit v1.1