diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 10:23:56 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 10:23:56 -0500 |
commit | 1204468415dd5248bbd01d7aaede520ede3b9d36 (patch) | |
tree | b378b94ff7266ce5c7f719b3ba55c836837869e9 /indra/newview/lltoolface.h | |
parent | 0f2248ea12713822c546e362487aa94bb29e2899 (diff) | |
parent | 1820095dd4a64c142e14869c76ae09e1e0ca6a12 (diff) |
Merge DRTVWR-489 to main on promotion of Emoji viewer (#673).
Diffstat (limited to 'indra/newview/lltoolface.h')
-rw-r--r-- | indra/newview/lltoolface.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h index e4b8ae12b8..7c8ff20480 100644 --- a/indra/newview/lltoolface.h +++ b/indra/newview/lltoolface.h @@ -39,11 +39,11 @@ class LLToolFace virtual ~LLToolFace(); public: - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); - virtual void handleSelect(); - virtual void handleDeselect(); - virtual void render(); // draw face highlights + virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) override; + virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask) override; + virtual void handleSelect() override; + virtual void handleDeselect() override; + virtual void render() override; // draw face highlights static void pickCallback(const LLPickInfo& pick_info); }; |