diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-27 15:17:57 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-28 08:24:59 +0800 |
| commit | 96a81b5ecbe3bffb582ded930752c0523df5e80a (patch) | |
| tree | a87a0bd09fd980562e88150dbfea3819d28d9f12 /indra/newview/llfloateremojipicker.h | |
| parent | 06e8f0c443c1ba7858d000c6d695b7e988e02053 (diff) | |
| parent | ed73208eb96b862b97fa285036edea1e792ca3c6 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llfloateremojipicker.h')
| -rw-r--r-- | indra/newview/llfloateremojipicker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h index bc64cb1f35..b807adb67d 100644 --- a/indra/newview/llfloateremojipicker.h +++ b/indra/newview/llfloateremojipicker.h @@ -45,7 +45,7 @@ public: LLFloaterEmojiPicker(const LLSD& key); - virtual BOOL postBuild() override; + virtual bool postBuild() override; virtual void dirtyRect() override; virtual void goneFromFront() override; @@ -94,7 +94,7 @@ private: void onOpen(const LLSD& key) override; void onClose(bool app_quitting) override; - virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override; + virtual bool handleKey(KEY key, MASK mask, bool called_from_parent) override; class LLPanel* mGroups { nullptr }; class LLPanel* mBadge { nullptr }; |