From 16b6738cdadc70966a93b6d025ae469738955dcb Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 26 Sep 2008 17:25:22 +0000
Subject: * Patch from JHurliman * Updates to libomv r2243, * Remove lots of
 unnecessary typecasts * Improves SendWindData() Thanks jhurliman. * Will
 update OpenSim-libs in 10 minutes..

---
 OpenSim/Data/MSSQL/MSSQLRegionData.cs | 4 ++--
 OpenSim/Data/MSSQL/MSSQLUserData.cs   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Data/MSSQL')

diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index ae94252..65f301f 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -850,7 +850,7 @@ VALUES
 
             newData.Name = (String)row["Name"];
             newData.Description = (String)row["Description"];
-            newData.OwnerID = (String)row["OwnerUUID"];
+            newData.OwnerID = (UUID)(String)row["OwnerUUID"];
             newData.IsGroupOwned = Convert.ToBoolean(row["IsGroupOwned"]);
             newData.Area = Convert.ToInt32(row["Area"]);
             newData.AuctionID = Convert.ToUInt32(row["AuctionID"]); //Unemplemented
@@ -910,7 +910,7 @@ VALUES
         {
             ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
             entry.AgentID = new UUID((string)row["AccessUUID"]);
-            entry.Flags = (ParcelManager.AccessList)Convert.ToInt32(row["Flags"]);
+            entry.Flags = (AccessList)Convert.ToInt32(row["Flags"]);
             entry.Time = new DateTime();
             return entry;
         }
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 6352cce..cbb7368 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -1052,7 +1052,7 @@ ELSE
                 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
 
                 // Current position
-                retval.Region = (string)reader["currentRegion"];
+                retval.Region = (UUID)(string)reader["currentRegion"];
                 retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
                 Vector3 tmp_v;
                 Vector3.TryParse((string)reader["currentPos"], out tmp_v);
-- 
cgit v1.1