diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-12 17:04:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 17:04:34 -0700 |
| commit | 100ebbab2437de7f5d124a0d7b8279a7a7b57656 (patch) | |
| tree | e8b4200dae16e89698c2f3eadae05634041681a1 /indra/newview/llfloateremojipicker.h | |
| parent | f5e2708a0fc4e08d3d0a5dc393bbd4bac09e1c55 (diff) | |
| parent | ae74ca80692c8bcf157e903033fcfa1778706d64 (diff) | |
Merge pull request #1745 from secondlife/project/gltf_development
move project/gltf development to develop
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 05b4826e37..669683eb9e 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; @@ -95,7 +95,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 }; |