diff options
author | Callum Prentice <callum@lindenlab.com> | 2023-05-02 09:39:03 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2023-05-02 09:39:03 -0700 |
commit | bb96ac2621dd09dbc318d04f7e04ffbc50ec3174 (patch) | |
tree | 9e692dbb89e46faaea656af979b6855502481772 /indra/newview/llfloateravatarrendersettings.h | |
parent | fbf5b199f3bd9775bc992609baf6c093177a70d8 (diff) | |
parent | 7ed52090a67882cd0bc904f1e0a9ce07cf6768e9 (diff) |
MErge with main after Viewer release
Diffstat (limited to 'indra/newview/llfloateravatarrendersettings.h')
-rw-r--r-- | indra/newview/llfloateravatarrendersettings.h | 4 |
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; }; |