From fe49c96ee0db0974a91b9b175ac1b00aef035797 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Mon, 3 Mar 2008 08:30:36 +0000 Subject: * Applying Ahzz's profile patch. Thanks Ahzz! * Fixed a few bugs in the patch that are sim crashers. * There's still a bug in mySQL mode/ grid mode where the main userprofile text doesn't save. --- OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Framework/Data.SQLite') diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs index 2316de8..22f0053 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs @@ -590,7 +590,7 @@ namespace OpenSim.Framework.Data.SQLite // interesting has to be done to actually get these values // back out. Not enough time to figure it out yet. UserProfileData user = new UserProfileData(); - user.UUID = new LLUUID((String) row["UUID"]); + LLUUID.TryParse((String)row["UUID"], out user.UUID); user.username = (String) row["username"]; user.surname = (String) row["surname"]; user.passwordHash = (String) row["passwordHash"]; @@ -617,8 +617,8 @@ namespace OpenSim.Framework.Data.SQLite user.profileWantDoMask = Convert.ToUInt32(row["profileWantDoMask"]); user.profileAboutText = (String) row["profileAboutText"]; user.profileFirstText = (String) row["profileFirstText"]; - user.profileImage = new LLUUID((String) row["profileImage"]); - user.profileFirstImage = new LLUUID((String) row["profileFirstImage"]); + LLUUID.TryParse((String)row["profileImage"], out user.profileImage); + LLUUID.TryParse((String)row["profileFirstImage"], out user.profileFirstImage); user.webLoginKey = new LLUUID((String) row["webLoginKey"]); return user; @@ -832,4 +832,4 @@ namespace OpenSim.Framework.Data.SQLite return true; } } -} \ No newline at end of file +} -- cgit v1.1