diff options
author | Melanie | 2013-12-07 01:19:20 +0000 |
---|---|---|
committer | Melanie | 2013-12-07 01:19:20 +0000 |
commit | ba48816fb676d17298e03e82579fc4f54fa48800 (patch) | |
tree | cfa25ad1116eb0f7bd42eb2d2ebecf19eae939e8 /OpenSim/Services/UserProfilesService/UserProfilesService.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.zip opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.tar.gz opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.tar.bz2 opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/UserProfilesService/UserProfilesService.cs')
-rw-r--r-- | OpenSim/Services/UserProfilesService/UserProfilesService.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs index d00f34d..69c7b91 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs | |||
@@ -163,6 +163,18 @@ 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 | |||
166 | #region Utility | 178 | #region Utility |
167 | public OSD AvatarImageAssetsRequest(UUID avatarId) | 179 | public OSD AvatarImageAssetsRequest(UUID avatarId) |
168 | { | 180 | { |