diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-07-20 21:54:19 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-07-20 21:54:19 +0800 |
commit | 4cf12a6d223a238ff30f8b334ca91836c7369f88 (patch) | |
tree | a2bf8fa27e5fff8a1b8a75cdb5d835f4e959f145 /indra/newview/llfloateremojipicker.h | |
parent | 13f24f2419edeefbda8bedab01fad21cb97b7445 (diff) | |
parent | 569d97707459d5f87cb04a0811c0b7eb1b5c2251 (diff) |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/newview/llfloateremojipicker.h')
-rw-r--r-- | indra/newview/llfloateremojipicker.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h index 05b4826e37..bc64cb1f35 100644 --- a/indra/newview/llfloateremojipicker.h +++ b/indra/newview/llfloateremojipicker.h @@ -60,7 +60,6 @@ public: private: void initialize(); void fillGroups(); - void fillCategoryRecentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats); void fillCategoryFrequentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats); void fillGroupEmojis(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats, U32 index); void createGroupButton(LLButton::Params& params, const LLRect& rect, llwchar emoji); |