aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/UserProfilesService/UserProfilesService.cs
diff options
context:
space:
mode:
authordahlia2013-12-06 15:58:51 -0800
committerdahlia2013-12-06 15:58:51 -0800
commitaba2a444538fc0ab5ae093004dc9994abab299e3 (patch)
tree21b1dc7790e08ba8de07c073dd7b6186ce10d938 /OpenSim/Services/UserProfilesService/UserProfilesService.cs
parentuse System.IO.Compression.DeflateStream for mesh decompression in an attempt ... (diff)
parentAdd support for user preferences (im via email) (diff)
downloadopensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.zip
opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.gz
opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.bz2
opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/UserProfilesService/UserProfilesService.cs12
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 {