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.
---
 .../Handlers/Profiles/UserProfilesConnector.cs     |  2 -
 .../Handlers/Profiles/UserProfilesHandlers.cs      | 53 ----------------------
 2 files changed, 55 deletions(-)

(limited to 'OpenSim/Server/Handlers')

diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index 6403882..28dbbc2 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -104,8 +104,6 @@ namespace OpenSim.Server.Handlers.Profiles
             Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
             Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
             Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
-            Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferenecesUpdate);
-            Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
             Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
             Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
             Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
index d30cc22..f5f0794 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -381,59 +381,6 @@ namespace OpenSim.Server.Handlers
         }
         #endregion Interests
 
-        #region User Preferences
-        public bool UserPreferencesRequest(OSDMap json, ref JsonRpcResponse response)
-        {
-            if(!json.ContainsKey("params"))
-            {
-                response.Error.Code = ErrorCode.ParseError;
-                m_log.DebugFormat ("User Preferences Request");
-                return false;
-            }
-
-            string result = string.Empty;
-            UserPreferences prefs = new UserPreferences();
-            object Prefs = (object)prefs;
-            OSD.DeserializeMembers(ref Prefs, (OSDMap)json["params"]);
-            if(Service.UserPreferencesRequest(ref prefs, ref result))
-            {
-                response.Result = OSD.SerializeMembers(prefs);
-                return true;
-            }
-            
-            response.Error.Code = ErrorCode.InternalError;
-            response.Error.Message = string.Format("{0}", result);
-            m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message);
-            return false;
-        }
-
-        public bool UserPreferenecesUpdate(OSDMap json, ref JsonRpcResponse response)
-        {
-            if(!json.ContainsKey("params"))
-            {
-                response.Error.Code = ErrorCode.ParseError;
-                response.Error.Message = "no parameters supplied";
-                m_log.DebugFormat ("User Preferences Update Request");
-                return false;
-            }
-            
-            string result = string.Empty;
-            UserPreferences prefs = new UserPreferences();
-            object Prefs = (object)prefs;
-            OSD.DeserializeMembers(ref Prefs, (OSDMap)json["params"]);
-            if(Service.UserPreferencesUpdate(ref prefs, ref result))
-            {
-                response.Result = OSD.SerializeMembers(prefs);
-                return true;
-            }
-            
-            response.Error.Code = ErrorCode.InternalError;
-            response.Error.Message = string.Format("{0}", result);
-            m_log.InfoFormat("[PROFILES]: User preferences update error - {0}", response.Error.Message);
-            return false;
-        }
-        #endregion User Preferences
-
         #region Utility
         public bool AvatarImageAssetsRequest(OSDMap json, ref JsonRpcResponse response)
         {
-- 
cgit v1.1