Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 1 insertions, 3 deletions

diff --git a/indra/newview/llpanelprofilepicks.h b/indra/newview/llpanelprofilepicks.h
index 76b1452431..90c527e0f3 100644
--- a/indra/newview/llpanelprofilepicks.h
+++ b/indra/newview/llpanelprofilepicks.h
@@ -58,7 +58,7 @@ public:
     void selectPick(const LLUUID& pick_id);
 
     void processProperties(void* data, EAvatarProcessorType type) override;
-    void processProperties(const LLAvatarPicks* avatar_picks);
+    void processProperties(const LLAvatarData* avatar_picks);
 
     void resetData() override;
 
@@ -77,8 +77,6 @@ public:
     bool hasUnsavedChanges() override;
     void commitUnsavedChanges() override;
 
-    friend void request_avatar_properties_coro(std::string cap_url, LLUUID agent_id);
-
 private:
     void onClickNewBtn();
     void onClickDelete();