From deae0301456a169540aafc4ff1a574e1304e327d Mon Sep 17 00:00:00 2001
From: AlexRa
Date: Wed, 19 May 2010 02:28:19 +0300
Subject: Some more corrections after MySQL connector update

---
 OpenSim/Data/MySQL/MySQLAssetData.cs     | 3 ++-
 OpenSim/Data/MySQL/MySQLInventoryData.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 13f5fa2..ec18c28 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -33,6 +33,7 @@ using log4net;
 using MySql.Data.MySqlClient;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Data;
 
 namespace OpenSim.Data.MySQL
 {
@@ -320,7 +321,7 @@ namespace OpenSim.Data.MySQL
                                 metadata.Type = (sbyte)dbReader["assetType"];
                                 metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
                                 metadata.Flags = (AssetFlags)Convert.ToInt32(dbReader["asset_flags"]);
-                                metadata.FullID = new UUID((string)dbReader["id"]);
+                                metadata.FullID = DBGuid.FromDB(dbReader["id"]);
 
                                 // Current SHA1s are not stored/computed.
                                 metadata.SHA1 = new byte[] { };
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 8fbe7a8..0aea30f 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -287,7 +287,7 @@ namespace OpenSim.Data.MySQL
 
                 // TODO: this is to handle a case where NULLs creep in there, which we are not sure is endemic to the system, or legacy.  It would be nice to live fix these.
                 // ( DBGuid.FromDB() reads db NULLs as well, returns UUID.Zero )
-                item.CreatorId = DBGuid.FromDB(reader["creatorID"]).ToString();
+                item.CreatorId = reader["creatorID"].ToString();
                 
                 // Be a bit safer in parsing these because the
                 // database doesn't enforce them to be not null, and
-- 
cgit v1.1