diff options
| author | Roxanne Skelly <roxie@lindenlab.com> | 2024-05-20 14:36:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-20 14:36:14 -0700 |
| commit | a1d7d2abc304b59fbca26f0ca23c926762be10a1 (patch) | |
| tree | fcb3901b838af753e40c2ddd1ce84b95a6c2f603 /indra/newview/llfloateremojipicker.h | |
| parent | f51797f088808029745161854aa86b775f041a64 (diff) | |
| parent | 3a212d9608492ae64a3a32f80790371b90be9e9e (diff) | |
Merge pull request #1532 from secondlife/roxie/webrtc-voice
[WebRTC] Merge from main
Diffstat (limited to 'indra/newview/llfloateremojipicker.h')
| -rw-r--r-- | indra/newview/llfloateremojipicker.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h index 5d0402ca83..05b4826e37 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,6 +94,7 @@ private: void unselectGridIcon(LLEmojiGridIcon* icon); void onOpen(const LLSD& key) override; + void onClose(bool app_quitting) override; virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent) override; class LLPanel* mGroups { nullptr }; |