diff options
| author | Alexander Gavriliuk <gavriliuk@gmail.com> | 2023-07-05 12:46:42 +0200 |
|---|---|---|
| committer | Alexander Gavriliuk <gavriliuk@gmail.com> | 2023-07-05 12:46:42 +0200 |
| commit | 0414fada8163409adf95f9d7c75a7db5f0952103 (patch) | |
| tree | 0d1c913081e6342adc9d6ffd2652feae5c4d3bf0 | |
| parent | 8bbbce015b6dae1bdafe0bba329463322642ca85 (diff) | |
macos build fix
| -rw-r--r-- | indra/newview/llfloateremojipicker.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llfloateremojipicker.h | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp index 8c7f38d324..67d5d8ea6b 100644 --- a/indra/newview/llfloateremojipicker.cpp +++ b/indra/newview/llfloateremojipicker.cpp @@ -100,9 +100,7 @@ public: addChild(mList); } - virtual void updatePanel(BOOL allow_modify) - { - } + virtual void updatePanel(BOOL allow_modify) override {} public: LLScrollingPanelList* mList; @@ -140,9 +138,7 @@ public: true); // use_color } - virtual void updatePanel(BOOL allow_modify) - { - } + virtual void updatePanel(BOOL allow_modify) override {} private: const LLWString mText; @@ -183,7 +179,7 @@ public: true); // use_color } - virtual void updatePanel(BOOL allow_modify) {} + virtual void updatePanel(BOOL allow_modify) override {} llwchar getEmoji() const { return mEmoji; } LLWString getText() const { return mText; } diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h index ba71f04830..68c694d89a 100644 --- a/indra/newview/llfloateremojipicker.h +++ b/indra/newview/llfloateremojipicker.h @@ -52,7 +52,7 @@ public: void show(pick_callback_t pick_callback = nullptr, close_callback_t close_callback = nullptr); - virtual void closeFloater(bool app_quitting = false); + virtual void closeFloater(bool app_quitting = false) override; private: void fillEmojis(); |