Merge branch 'SledjChisl'

1 files changed, 23 insertions, 21 deletions

diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 96c13c0..76aa093 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Services.ProfilesService
         static readonly ILog m_log =
             LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         IUserAccountService userAccounts;
 
         public UserProfilesService(IConfigSource config, string configName):
@@ -58,23 +58,23 @@ namespace OpenSim.Services.ProfilesService
                 return;
             }
             Object[] args = null;
-            
+
             args = new Object[] { config };
             string accountService = Config.GetString("UserAccountService", String.Empty);
             if (accountService != string.Empty)
                 userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
-            
+
             args = new Object[] { config };
         }
-        
+
         #region Classifieds
         public OSD AvatarClassifiedsRequest(UUID creatorId)
         {
             OSDArray records = ProfilesData.GetClassifiedRecords(creatorId);
-            
+
             return records;
         }
-        
+
         public bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result)
         {
             if(!ProfilesData.UpdateClassifiedRecord(ad, ref result))
@@ -84,74 +84,74 @@ namespace OpenSim.Services.ProfilesService
             result = "success";
             return true;
         }
-        
+
         public bool ClassifiedDelete(UUID recordId)
         {
             if(ProfilesData.DeleteClassifiedRecord(recordId))
                 return true;
-            
+
             return false;
         }
-        
+
         public bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result)
         {
             if(ProfilesData.GetClassifiedInfo(ref ad, ref result))
                 return true;
-            
+
             return false;
         }
         #endregion Classifieds
-        
+
         #region Picks
         public OSD AvatarPicksRequest(UUID creatorId)
         {
             OSDArray records = ProfilesData.GetAvatarPicks(creatorId);
-            
+
             return records;
         }
-        
+
         public bool PickInfoRequest(ref UserProfilePick pick, ref string result)
         {
             pick = ProfilesData.GetPickInfo(pick.CreatorId, pick.PickId);
             result = "OK";
             return true;
         }
-        
+
         public bool PicksUpdate(ref UserProfilePick pick, ref string result)
         {
             return ProfilesData.UpdatePicksRecord(pick);
         }
-        
+
         public bool PicksDelete(UUID pickId)
         {
             return ProfilesData.DeletePicksRecord(pickId);
         }
         #endregion Picks
-        
+
         #region Notes
         public bool AvatarNotesRequest(ref UserProfileNotes note)
         {
             return ProfilesData.GetAvatarNotes(ref note);
         }
-        
+
         public bool NotesUpdate(ref UserProfileNotes note, ref string result)
         {
             return ProfilesData.UpdateAvatarNotes(ref note, ref result);
         }
         #endregion Notes
-        
+
         #region Profile Properties
         public bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result)
         {
             return ProfilesData.GetAvatarProperties(ref prop, ref result);
         }
-        
+
         public bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result)
         {
             return ProfilesData.UpdateAvatarProperties(ref prop, ref result);
         }
         #endregion Profile Properties
-        
+
         #region Interests
         public bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result)
         {
@@ -159,6 +159,7 @@ namespace OpenSim.Services.ProfilesService
         }
         #endregion Interests
 
+
         #region User Preferences
         public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
         {
@@ -239,6 +240,7 @@ namespace OpenSim.Services.ProfilesService
         }
         #endregion User Preferences
 
+
         #region Utility
         public OSD AvatarImageAssetsRequest(UUID avatarId)
         {
@@ -252,7 +254,7 @@ namespace OpenSim.Services.ProfilesService
         {
             return ProfilesData.GetUserAppData(ref prop, ref result);
         }
-        
+
         public bool SetUserAppData(UserAppData prop, ref string result)
         {
             return true;