Merge branch 'main' into DRTVWR-567

# Conflicts:
#	indra/newview/llappviewer.cpp

1 files changed, 0 insertions, 4 deletions

diff --git a/indra/newview/llfloateravatarrendersettings.h b/indra/newview/llfloateravatarrendersettings.h
index 00ee074f17..2e0a844afd 100644
--- a/indra/newview/llfloateravatarrendersettings.h
+++ b/indra/newview/llfloateravatarrendersettings.h
@@ -48,7 +48,6 @@ public:
     void onAvatarListRightClick(LLUICtrl* ctrl, S32 x, S32 y);
 
     void updateList();
-    void onFilterEdit(const std::string& search_string);
     void onCustomAction (const LLSD& userdata, const LLUUID& av_id);
     bool isActionChecked(const LLSD& userdata, const LLUUID& av_id);
     void onClickAdd(const LLSD& userdata);
@@ -59,15 +58,12 @@ public:
     static void setNeedsUpdate();
 
 private:
-    bool isHiddenRow(const std::string& av_name);
     void callbackAvatarPicked(const uuid_vec_t& ids, S32 visual_setting);
     void removePicker();
 
     bool mNeedsUpdate;
     LLListContextMenu* mContextMenu;
     LLNameListCtrl* mAvatarSettingsList;
-
-    std::string mNameFilter;
 };