aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-20 19:13:34 +0000
committerJustin Clarke Casey2007-12-20 19:13:34 +0000
commitf1ebe79824aa82fa30af35d07bf6720e719cd741 (patch)
tree18f43d04bdf2547dd66274a96f22c85171fc892a /OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
parentEstablish Util.ToRawUuidString to get LLUUIDs in unhyphenated form (diff)
downloadopensim-SC-f1ebe79824aa82fa30af35d07bf6720e719cd741.zip
opensim-SC-f1ebe79824aa82fa30af35d07bf6720e719cd741.tar.gz
opensim-SC-f1ebe79824aa82fa30af35d07bf6720e719cd741.tar.bz2
opensim-SC-f1ebe79824aa82fa30af35d07bf6720e719cd741.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework/Data.SQLite/SQLiteUserData.cs')
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteUserData.cs12
1 files changed, 6 insertions, 6 deletions
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
77 { 77 {
78 lock (ds) 78 lock (ds)
79 { 79 {
80 DataRow row = ds.Tables["users"].Rows.Find(uuid); 80 DataRow row = ds.Tables["users"].Rows.Find(Util.ToRawUuidString(uuid));
81 if (row != null) 81 if (row != null)
82 { 82 {
83 UserProfileData user = buildUserProfile(row); 83 UserProfileData user = buildUserProfile(row);
84 row = ds.Tables["useragents"].Rows.Find(uuid); 84 row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(uuid));
85 if (row != null) 85 if (row != null)
86 { 86 {
87 user.currentAgent = buildUserAgent(row); 87 user.currentAgent = buildUserAgent(row);
@@ -105,7 +105,7 @@ namespace OpenSim.Framework.Data.SQLite
105 if (rows.Length > 0) 105 if (rows.Length > 0)
106 { 106 {
107 UserProfileData user = buildUserProfile(rows[0]); 107 UserProfileData user = buildUserProfile(rows[0]);
108 DataRow row = ds.Tables["useragents"].Rows.Find(user.UUID); 108 DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.UUID));
109 if (row != null) 109 if (row != null)
110 { 110 {
111 user.currentAgent = buildUserAgent(row); 111 user.currentAgent = buildUserAgent(row);
@@ -220,7 +220,7 @@ namespace OpenSim.Framework.Data.SQLite
220 DataTable users = ds.Tables["users"]; 220 DataTable users = ds.Tables["users"];
221 lock (ds) 221 lock (ds)
222 { 222 {
223 DataRow row = users.Rows.Find(user.UUID); 223 DataRow row = users.Rows.Find(Util.ToRawUuidString(user.UUID));
224 if (row == null) 224 if (row == null)
225 { 225 {
226 row = users.NewRow(); 226 row = users.NewRow();
@@ -238,7 +238,7 @@ namespace OpenSim.Framework.Data.SQLite
238 if (user.currentAgent != null) 238 if (user.currentAgent != null)
239 { 239 {
240 DataTable ua = ds.Tables["useragents"]; 240 DataTable ua = ds.Tables["useragents"];
241 row = ua.Rows.Find(user.UUID); 241 row = ua.Rows.Find(Util.ToRawUuidString(user.UUID));
242 if (row == null) 242 if (row == null)
243 { 243 {
244 row = ua.NewRow(); 244 row = ua.NewRow();
@@ -255,7 +255,7 @@ namespace OpenSim.Framework.Data.SQLite
255 // I just added this to help the standalone login situation. 255 // I just added this to help the standalone login situation.
256 //It still needs to be looked at by a Database guy 256 //It still needs to be looked at by a Database guy
257 DataTable ua = ds.Tables["useragents"]; 257 DataTable ua = ds.Tables["useragents"];
258 row = ua.Rows.Find(user.UUID); 258 row = ua.Rows.Find(Util.ToRawUuidString(user.UUID));
259 259
260 if (row == null) 260 if (row == null)
261 { 261 {