From 958a8f274b8a25703935ab4092f190e9d54b8559 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 7 Dec 2013 01:29:15 +0000
Subject: Revert "Add support for user preferences (im via email)"

This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
---
 OpenSim/Services/UserProfilesService/UserProfilesService.cs | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'OpenSim/Services/UserProfilesService')

diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 69c7b91..d00f34d 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -163,18 +163,6 @@ namespace OpenSim.Services.ProfilesService
         }
         #endregion Interests
 
-        #region User Preferences
-        public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
-        {
-            return ProfilesData.UpdateUserPreferences(ref pref, ref result);
-        }
-
-        public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
-        {
-            return ProfilesData.GetUserPreferences(ref pref, ref result);
-        }
-        #endregion User Preferences
-
         #region Utility
         public OSD AvatarImageAssetsRequest(UUID avatarId)
         {
-- 
cgit v1.1


From 1eecb34e62987f43181bea912464b76eb4c6aa45 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 5 Jan 2014 21:16:30 +0000
Subject: Remove the core module extra profile settings support carried in with
 the latest patches. We don't need it.

---
 OpenSim/Services/UserProfilesService/UserProfilesService.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Services/UserProfilesService')

diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index dd26cdc..038e993 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)
-- 
cgit v1.1