From c15eec2cb0b4d549a75af98a06ce75170c9c1d4e Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 15 Jan 2008 22:16:43 +0000
Subject: * Restore non dash asset UUID persistence which was made dashed in
 r3069 * Apologies, any sqlite databases created between r3069 and this change
 will now contain unfindable assets. * But sqlite asset databases used
 previous to r3069 will now work again. * This change may have been done on
 purpose, so it's not impossible it will be re-reverted

---
 OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Framework/Data.SQLite')

diff --git a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
index e2b28cd..76608c7 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteAssetData.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Data.SQLite
             
             using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
             {
-                cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.UUID.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(uuid)));
                 using (IDataReader reader = cmd.ExecuteReader()) 
                 {
                     if (reader.Read())
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Data.SQLite
 
         public void CreateAsset(AssetBase asset)
         {
-            MainLog.Instance.Verbose("SQLITE", "Creating Asset " + asset.FullID.UUID.ToString());
+            MainLog.Instance.Verbose("SQLITE", "Creating Asset " + Util.ToRawUuidString(asset.FullID));
             if (ExistsAsset(asset.FullID))
             {
                 MainLog.Instance.Verbose("SQLITE", "Asset exists, updating instead.  You should fix the caller for this!");
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Data.SQLite
             {
                 using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
                 {
-                    cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.UUID.ToString()));
+                    cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));
                     cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
                     cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
                     cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.Data.SQLite
             
             using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
             {
-                cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.UUID.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(asset.FullID)));
                 cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
                 cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
                 cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
@@ -145,7 +145,7 @@ namespace OpenSim.Framework.Data.SQLite
         {
             using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn))
             {
-                cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.UUID.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(uuid)));
                 using (IDataReader reader = cmd.ExecuteReader()) 
                 {
                     if(reader.Read())
@@ -166,7 +166,7 @@ namespace OpenSim.Framework.Data.SQLite
         {
             using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn))
             {
-                cmd.Parameters.Add(new SqliteParameter(":UUID", uuid.UUID.ToString()));
+                cmd.Parameters.Add(new SqliteParameter(":UUID", Util.ToRawUuidString(uuid)));
                 
                 cmd.ExecuteNonQuery();
             }
-- 
cgit v1.1