aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2013-12-07 01:29:15 +0000
committerMelanie2013-12-07 01:29:15 +0000
commit958a8f274b8a25703935ab4092f190e9d54b8559 (patch)
treef2c8e71418c4cc1ceab11aa9ec217df929474b89 /OpenSim/Services
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-958a8f274b8a25703935ab4092f190e9d54b8559.zip
opensim-SC-958a8f274b8a25703935ab4092f190e9d54b8559.tar.gz
opensim-SC-958a8f274b8a25703935ab4092f190e9d54b8559.tar.bz2
opensim-SC-958a8f274b8a25703935ab4092f190e9d54b8559.tar.xz
Revert "Add support for user preferences (im via email)"
This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Interfaces/IUserProfilesService.cs5
-rw-r--r--OpenSim/Services/UserProfilesService/UserProfilesService.cs12
2 files changed, 0 insertions, 17 deletions
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
index 121baa8..319d307 100644
--- a/OpenSim/Services/Interfaces/IUserProfilesService.cs
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -57,11 +57,6 @@ namespace OpenSim.Services.Interfaces
57 bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result); 57 bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
58 bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result); 58 bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
59 #endregion Profile Properties 59 #endregion Profile Properties
60
61 #region User Preferences
62 bool UserPreferencesRequest(ref UserPreferences pref, ref string result);
63 bool UserPreferencesUpdate(ref UserPreferences pref, ref string result);
64 #endregion User Preferences
65 60
66 #region Interests 61 #region Interests
67 bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result); 62 bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);
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
163 } 163 }
164 #endregion Interests 164 #endregion Interests
165 165
166 #region User Preferences
167 public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
168 {
169 return ProfilesData.UpdateUserPreferences(ref pref, ref result);
170 }
171
172 public bool UserPreferencesRequest(ref UserPreferences pref, ref string result)
173 {
174 return ProfilesData.GetUserPreferences(ref pref, ref result);
175 }
176 #endregion User Preferences
177
178 #region Utility 166 #region Utility
179 public OSD AvatarImageAssetsRequest(UUID avatarId) 167 public OSD AvatarImageAssetsRequest(UUID avatarId)
180 { 168 {