diff options
author | Melanie | 2014-01-05 21:16:30 +0000 |
---|---|---|
committer | Melanie | 2014-01-05 21:16:30 +0000 |
commit | 1eecb34e62987f43181bea912464b76eb4c6aa45 (patch) | |
tree | d4c7e991531eb034249645ab0e26be9d14f41cf9 /OpenSim/Data | |
parent | Intermediate commit. Sill errors. (diff) | |
download | opensim-SC-1eecb34e62987f43181bea912464b76eb4c6aa45.zip opensim-SC-1eecb34e62987f43181bea912464b76eb4c6aa45.tar.gz opensim-SC-1eecb34e62987f43181bea912464b76eb4c6aa45.tar.bz2 opensim-SC-1eecb34e62987f43181bea912464b76eb4c6aa45.tar.xz |
Remove the core module extra profile settings support carried in with the latest
patches. We don't need it.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs index 8e9f77d..8b50c54 100644 --- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs +++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs | |||
@@ -941,8 +941,8 @@ namespace OpenSim.Data.MySQL | |||
941 | using (MySqlCommand put = new MySqlCommand(query, dbcon)) | 941 | using (MySqlCommand put = new MySqlCommand(query, dbcon)) |
942 | { | 942 | { |
943 | 943 | ||
944 | put.Parameters.AddWithValue("?Email", pref.EMail); | 944 | // put.Parameters.AddWithValue("?Email", pref.EMail); |
945 | put.Parameters.AddWithValue("?uuid", pref.UserId.ToString()); | 945 | // put.Parameters.AddWithValue("?uuid", pref.UserId.ToString()); |
946 | 946 | ||
947 | put.ExecuteNonQuery(); | 947 | put.ExecuteNonQuery(); |
948 | } | 948 | } |
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs index 90d45e9..84e56b1 100644 --- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | |||
@@ -748,6 +748,7 @@ namespace OpenSim.Data.SQLite | |||
748 | return true; | 748 | return true; |
749 | } | 749 | } |
750 | 750 | ||
751 | /* | ||
751 | public bool UpdateUserPreferences(ref UserPreferences pref, ref string result) | 752 | public bool UpdateUserPreferences(ref UserPreferences pref, ref string result) |
752 | { | 753 | { |
753 | string query = string.Empty; | 754 | string query = string.Empty; |
@@ -830,6 +831,7 @@ namespace OpenSim.Data.SQLite | |||
830 | } | 831 | } |
831 | return true; | 832 | return true; |
832 | } | 833 | } |
834 | */ | ||
833 | 835 | ||
834 | public bool GetUserAppData(ref UserAppData props, ref string result) | 836 | public bool GetUserAppData(ref UserAppData props, ref string result) |
835 | { | 837 | { |