diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Services/UserProfilesService/UserProfilesService.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Services/UserProfilesService/UserProfilesService.cs')
| -rw-r--r-- | OpenSim/Services/UserProfilesService/UserProfilesService.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs index 96c13c0..35fe31b 100644 --- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs +++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs | |||
| @@ -159,6 +159,7 @@ namespace OpenSim.Services.ProfilesService | |||
| 159 | } | 159 | } |
| 160 | #endregion Interests | 160 | #endregion Interests |
| 161 | 161 | ||
| 162 | /* | ||
| 162 | #region User Preferences | 163 | #region User Preferences |
| 163 | public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result) | 164 | public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result) |
| 164 | { | 165 | { |
| @@ -238,6 +239,7 @@ namespace OpenSim.Services.ProfilesService | |||
| 238 | return true; | 239 | return true; |
| 239 | } | 240 | } |
| 240 | #endregion User Preferences | 241 | #endregion User Preferences |
| 242 | */ | ||
| 241 | 243 | ||
| 242 | #region Utility | 244 | #region Utility |
| 243 | public OSD AvatarImageAssetsRequest(UUID avatarId) | 245 | public OSD AvatarImageAssetsRequest(UUID avatarId) |