From 1eecb34e62987f43181bea912464b76eb4c6aa45 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sun, 5 Jan 2014 21:16:30 +0000 Subject: [PATCH] Remove the core module extra profile settings support carried in with the latest patches. We don't need it. --- OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 4 ++-- OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 2 ++ OpenSim/Services/UserProfilesService/UserProfilesService.cs | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs index 8e9f77db75..8b50c5498d 100644 --- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs +++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs @@ -941,8 +941,8 @@ namespace OpenSim.Data.MySQL using (MySqlCommand put = new MySqlCommand(query, dbcon)) { - put.Parameters.AddWithValue("?Email", pref.EMail); - put.Parameters.AddWithValue("?uuid", pref.UserId.ToString()); +// put.Parameters.AddWithValue("?Email", pref.EMail); +// put.Parameters.AddWithValue("?uuid", pref.UserId.ToString()); put.ExecuteNonQuery(); } diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs index 90d45e9c0e..84e56b1dc0 100644 --- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs @@ -748,6 +748,7 @@ namespace OpenSim.Data.SQLite return true; } + /* public bool UpdateUserPreferences(ref UserPreferences pref, ref string result) { string query = string.Empty; @@ -830,6 +831,7 @@ namespace OpenSim.Data.SQLite } return true; } + */ public bool GetUserAppData(ref UserAppData props, ref string result) { diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs index dd26cdcb13..038e993d56 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs @@ -164,6 +164,7 @@ namespace OpenSim.Services.ProfilesService } #endregion Interests + /* #region User Preferences public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result) { @@ -235,6 +236,7 @@ namespace OpenSim.Services.ProfilesService return ProfilesData.GetUserPreferences(ref pref, ref result); } #endregion User Preferences + */ #region Utility public OSD AvatarImageAssetsRequest(UUID avatarId)