diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-23 18:23:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 18:23:56 -0400 |
| commit | 9036e4582cec1893016bd692293ec1c0135f7112 (patch) | |
| tree | f1dabff03453d87a78257d872acddb8f86f4da9c /indra/newview/llfloateremojipicker.h | |
| parent | 9289b96de48e0a3f57819ca173c5d5d51ad25c56 (diff) | |
| parent | 74badfcfb07733214cbe5aa5ae02bd413f8465a2 (diff) | |
Merge pull request #2652 from secondlife/lua-merge-dev2
Merge develop into release/luau-scripting
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 669683eb9e..b807adb67d 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); |