From f1ebe79824aa82fa30af35d07bf6720e719cd741 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 20 Dec 2007 19:13:34 +0000
Subject: Fix up other sqlite db interactions to use non-hyphenated uuid
 Inventory contents retrieval and persistent region storage standalone now
 appear to work as well as they did before :) This patch will not fix grid
 problems. May be bugs present due to conversions I didn't spot. I personally
 probably don't have any more time for this today.  I'm also not entirely
 convinced this is the right way forward so this might be a handy pause for
 thought.  I'll also be delighted if I wake up tommorrow and everything is
 fine again.

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

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

diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index 99121be..461cd08 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -77,11 +77,11 @@ namespace OpenSim.Framework.Data.SQLite
         {
             lock (ds)
             {
-                DataRow row = ds.Tables["users"].Rows.Find(uuid);
+                DataRow row = ds.Tables["users"].Rows.Find(Util.ToRawUuidString(uuid));
                 if (row != null)
                 {
                     UserProfileData user = buildUserProfile(row);
-                    row = ds.Tables["useragents"].Rows.Find(uuid);
+                    row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(uuid));
                     if (row != null)
                     {
                         user.currentAgent = buildUserAgent(row);
@@ -105,7 +105,7 @@ namespace OpenSim.Framework.Data.SQLite
                 if (rows.Length > 0)
                 {
                     UserProfileData user = buildUserProfile(rows[0]);
-                    DataRow row = ds.Tables["useragents"].Rows.Find(user.UUID);
+                    DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.UUID));
                     if (row != null)
                     {
                         user.currentAgent = buildUserAgent(row);
@@ -220,7 +220,7 @@ namespace OpenSim.Framework.Data.SQLite
             DataTable users = ds.Tables["users"];
             lock (ds)
             {
-                DataRow row = users.Rows.Find(user.UUID);
+                DataRow row = users.Rows.Find(Util.ToRawUuidString(user.UUID));
                 if (row == null)
                 {
                     row = users.NewRow();
@@ -238,7 +238,7 @@ namespace OpenSim.Framework.Data.SQLite
                 if (user.currentAgent != null)
                 {
                     DataTable ua = ds.Tables["useragents"];
-                    row = ua.Rows.Find(user.UUID);
+                    row = ua.Rows.Find(Util.ToRawUuidString(user.UUID));
                     if (row == null)
                     {
                         row = ua.NewRow();
@@ -255,7 +255,7 @@ namespace OpenSim.Framework.Data.SQLite
                     // I just added this to help the standalone login situation.  
                     //It still needs to be looked at by a Database guy
                     DataTable ua = ds.Tables["useragents"];
-                    row = ua.Rows.Find(user.UUID);
+                    row = ua.Rows.Find(Util.ToRawUuidString(user.UUID));
 
                     if (row == null)
                     {
-- 
cgit v1.1