diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
index daedb9061d..d6a77d16dc 100644
--- a/indra/newview/llavatarpropertiesprocessor.cpp
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -532,16 +532,49 @@ void LLAvatarPropertiesProcessor::processClassifiedInfoReply(LLMessageSystem* ms
 void LLAvatarPropertiesProcessor::processAvatarNotesReply(LLMessageSystem* msg, void**)
 {
     // Deprecated, new "AgentProfile" allows larger notes
+    // <FS> OpenSim
+    LLAvatarNotes avatar_notes;
+
+    msg->getUUID(_PREHASH_AgentData, _PREHASH_AgentID, avatar_notes.agent_id);
+    msg->getUUID(_PREHASH_Data, _PREHASH_TargetID, avatar_notes.target_id);
+    msg->getString(_PREHASH_Data, _PREHASH_Notes, avatar_notes.notes);
+
+    LLAvatarPropertiesProcessor* self = getInstance();
+    // Request processed, no longer pending
+    self->removePendingRequest(avatar_notes.target_id, APT_NOTES);
+    self->notifyObservers(avatar_notes.target_id, &avatar_notes, APT_NOTES);
+    // </FS>
 }
 
 void LLAvatarPropertiesProcessor::processAvatarPicksReply(LLMessageSystem* msg, void**)
 {
-    LLUUID agent_id;
-    LLUUID target_id;
-    msg->getUUID(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
-    msg->getUUID(_PREHASH_AgentData, _PREHASH_TargetID, target_id);
+    // <FS> OpenSim
+    //LLUUID agent_id;
+    //LLUUID target_id;
+    //msg->getUUID(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
+    //msg->getUUID(_PREHASH_AgentData, _PREHASH_TargetID, target_id);
 
-    LL_DEBUGS("AvatarProperties") << "Received AvatarPicksReply for " << target_id << LL_ENDL;
+    //LL_DEBUGS("AvatarProperties") << "Received AvatarPicksReply for " << target_id << LL_ENDL;
+    LLAvatarPicks avatar_picks;
+    msg->getUUID(_PREHASH_AgentData, _PREHASH_AgentID, avatar_picks.agent_id);
+    msg->getUUID(_PREHASH_AgentData, _PREHASH_TargetID, avatar_picks.target_id);
+
+    S32 block_count = msg->getNumberOfBlocks(_PREHASH_Data);
+    for (int block = 0; block < block_count; ++block)
+    {
+        LLUUID pick_id;
+        std::string pick_name;
+
+        msg->getUUID(_PREHASH_Data, _PREHASH_PickID, pick_id, block);
+        msg->getString(_PREHASH_Data, _PREHASH_PickName, pick_name, block);
+
+        avatar_picks.picks_list.push_back(std::make_pair(pick_id, pick_name));
+    }
+    LLAvatarPropertiesProcessor* self = getInstance();
+    // Request processed, no longer pending
+    self->removePendingRequest(avatar_picks.target_id, APT_PICKS);
+    self->notifyObservers(avatar_picks.target_id, &avatar_picks, APT_PICKS);
+    // </FS> OpenSim
 }
 
 void LLAvatarPropertiesProcessor::processPickInfoReply(LLMessageSystem* msg, void**)
@@ -580,12 +613,35 @@ void LLAvatarPropertiesProcessor::processAvatarGroupsReply(LLMessageSystem* msg,
     AvatarGroupsReply is automatically sent by the server in response to the
     AvatarPropertiesRequest in addition to the AvatarPropertiesReply message.
     */
-    LLUUID agent_id;
-    LLUUID avatar_id;
-    msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
-    msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AvatarID, avatar_id);
+    // <FS> OpenSim
+    //LLUUID agent_id;
+    //LLUUID avatar_id;
+    //msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
+    //msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AvatarID, avatar_id);
 
-    LL_DEBUGS("AvatarProperties") << "Received AvatarGroupsReply for " << avatar_id << LL_ENDL;
+    //LL_DEBUGS("AvatarProperties") << "Received AvatarGroupsReply for " << avatar_id << LL_ENDL;
+    LLAvatarGroups avatar_groups;
+    msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, avatar_groups.agent_id);
+    msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AvatarID, avatar_groups.avatar_id);
+
+    S32 group_count = msg->getNumberOfBlocksFast(_PREHASH_GroupData);
+    for (S32 i = 0; i < group_count; ++i)
+    {
+        LLAvatarGroups::LLGroupData group_data;
+
+        msg->getU64(_PREHASH_GroupData, _PREHASH_GroupPowers, group_data.group_powers, i);
+        msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupTitle, group_data.group_title, i);
+        msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupID, group_data.group_id, i);
+        msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupName, group_data.group_name, i);
+        msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_GroupInsigniaID, group_data.group_insignia_id, i);
+
+        avatar_groups.group_list.push_back(group_data);
+    }
+
+    LLAvatarPropertiesProcessor* self = getInstance();
+    self->removePendingRequest(avatar_groups.avatar_id, APT_GROUPS);
+    self->notifyObservers(avatar_groups.avatar_id, &avatar_groups, APT_GROUPS);
+    // </FS> OpenSim
 }
 
 void LLAvatarPropertiesProcessor::notifyObservers(const LLUUID& id, void* data, EAvatarProcessorType type)
@@ -794,69 +850,6 @@ void LLAvatarPropertiesProcessor::sendAvatarGroupsRequest(const LLUUID& avatar_i
     sendGenericRequest(avatar_id, APT_GROUPS, "avatargroupsrequest");
 }
 
-void LLAvatarPropertiesProcessor::processAvatarNotesReply(LLMessageSystem* msg, void**)
-{
-    LLAvatarNotes avatar_notes;
-
-    msg->getUUID(_PREHASH_AgentData, _PREHASH_AgentID, avatar_notes.agent_id);
-    msg->getUUID(_PREHASH_Data, _PREHASH_TargetID, avatar_notes.target_id);
-    msg->getString(_PREHASH_Data, _PREHASH_Notes, avatar_notes.notes);
-
-    LLAvatarPropertiesProcessor* self = getInstance();
-    // Request processed, no longer pending
-    self->removePendingRequest(avatar_notes.target_id, APT_NOTES);
-    self->notifyObservers(avatar_notes.target_id,&avatar_notes,APT_NOTES);
-}
-
-void LLAvatarPropertiesProcessor::processAvatarPicksReply(LLMessageSystem* msg, void**)
-{
-    LLAvatarPicks avatar_picks;
-    msg->getUUID(_PREHASH_AgentData, _PREHASH_AgentID, avatar_picks.agent_id);
-    msg->getUUID(_PREHASH_AgentData, _PREHASH_TargetID, avatar_picks.target_id);
-
-    S32 block_count = msg->getNumberOfBlocks(_PREHASH_Data);
-    for (int block = 0; block < block_count; ++block)
-    {
-        LLUUID pick_id;
-        std::string pick_name;
-
-        msg->getUUID(_PREHASH_Data, _PREHASH_PickID, pick_id, block);
-        msg->getString(_PREHASH_Data, _PREHASH_PickName, pick_name, block);
-
-        avatar_picks.picks_list.push_back(std::make_pair(pick_id,pick_name));
-    }
-    LLAvatarPropertiesProcessor* self = getInstance();
-    // Request processed, no longer pending
-    self->removePendingRequest(avatar_picks.target_id, APT_PICKS);
-    self->notifyObservers(avatar_picks.target_id,&avatar_picks,APT_PICKS);
-}
-
-void LLAvatarPropertiesProcessor::processAvatarGroupsReply(LLMessageSystem* msg, void**)
-{
-    LLAvatarGroups avatar_groups;
-    msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, avatar_groups.agent_id );
-    msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AvatarID, avatar_groups.avatar_id );
-
-    S32 group_count = msg->getNumberOfBlocksFast(_PREHASH_GroupData);
-    for(S32 i = 0; i < group_count; ++i)
-    {
-        LLAvatarGroups::LLGroupData group_data;
-
-        msg->getU64(    _PREHASH_GroupData, _PREHASH_GroupPowers,   group_data.group_powers, i );
-        msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupTitle, group_data.group_title, i );
-        msg->getUUIDFast(  _PREHASH_GroupData, _PREHASH_GroupID,    group_data.group_id, i);
-        msg->getStringFast(_PREHASH_GroupData, _PREHASH_GroupName,  group_data.group_name, i );
-        msg->getUUIDFast(  _PREHASH_GroupData, _PREHASH_GroupInsigniaID, group_data.group_insignia_id, i );
-
-        avatar_groups.group_list.push_back(group_data);
-    }
-
-    LLAvatarPropertiesProcessor* self = getInstance();
-    self->removePendingRequest(avatar_groups.avatar_id, APT_GROUPS);
-    self->notifyObservers(avatar_groups.avatar_id,&avatar_groups,APT_GROUPS);
-}
-
-
 void LLAvatarPropertiesProcessor::sendNotes(const LLUUID& avatar_id, const std::string notes)
 {
     if(!avatar_id.isNull())
@@ -877,4 +870,3 @@ void LLAvatarPropertiesProcessor::sendNotes(const LLUUID& avatar_id, const std::
     }
 }
 // </FS>
-
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h
index 35d101519e..390ce42a39 100644
--- a/indra/newview/llavatarpropertiesprocessor.h
+++ b/indra/newview/llavatarpropertiesprocessor.h
@@ -315,15 +315,18 @@ public:
     // Processing of UDP variant of properties, truncates certain fields!
     static void processAvatarLegacyPropertiesReply(LLMessageSystem* msg, void**);
 
+    static void processAvatarInterestsReply(LLMessageSystem* msg, void**);
+
     static void processAvatarClassifiedsReply(LLMessageSystem* msg, void**);
 
     static void processClassifiedInfoReply(LLMessageSystem* msg, void**);
 
-    // <FS> OpenSim
     static void processAvatarGroupsReply(LLMessageSystem* msg, void**);
+
     static void processAvatarNotesReply(LLMessageSystem* msg, void**);
+
     static void processAvatarPicksReply(LLMessageSystem* msg, void**);
-    // </FS>
+
     static void processPickInfoReply(LLMessageSystem* msg, void**);
 
 protected: