aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs20
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserProfilesData.cs3
2 files changed, 16 insertions, 7 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 63492c2..6ed3b06 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -546,6 +546,10 @@ namespace OpenSim.Data.MySQL
546 reader.Read(); 546 reader.Read();
547 notes.Notes = OSD.FromString((string)reader["notes"]); 547 notes.Notes = OSD.FromString((string)reader["notes"]);
548 } 548 }
549 else
550 {
551 notes.Notes = OSD.FromString("");
552 }
549 } 553 }
550 } 554 }
551 } 555 }
@@ -925,15 +929,19 @@ namespace OpenSim.Data.MySQL
925 } 929 }
926 else 930 else
927 { 931 {
932 dbcon.Close();
933 dbcon.Open();
934
935 query = "INSERT INTO usersettings VALUES ";
936 query += "(?uuid,'false','false', ?Email)";
937
928 using (MySqlCommand put = new MySqlCommand(query, dbcon)) 938 using (MySqlCommand put = new MySqlCommand(query, dbcon))
929 { 939 {
930 query = "INSERT INTO usersettings VALUES ";
931 query += "(?Id,'false','false', '')";
932 940
933 lock(Lock) 941 put.Parameters.AddWithValue("?Email", pref.EMail);
934 { 942 put.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
935 put.ExecuteNonQuery(); 943
936 } 944 put.ExecuteNonQuery();
937 } 945 }
938 } 946 }
939 } 947 }
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 916a226..90d45e9 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -808,11 +808,12 @@ namespace OpenSim.Data.SQLite
808 else 808 else
809 { 809 {
810 query = "INSERT INTO usersettings VALUES "; 810 query = "INSERT INTO usersettings VALUES ";
811 query += "(:Id,'false','false', '')"; 811 query += "(:Id,'false','false', :Email)";
812 812
813 using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand()) 813 using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
814 { 814 {
815 put.Parameters.AddWithValue(":Id", pref.UserId.ToString()); 815 put.Parameters.AddWithValue(":Id", pref.UserId.ToString());
816 put.Parameters.AddWithValue(":Email", pref.EMail);
816 put.ExecuteNonQuery(); 817 put.ExecuteNonQuery();
817 818
818 } 819 }