diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 11:15:53 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 11:15:53 -0500 |
| commit | b242d696ba03f66494dfca1f05a74ed1b15cd6e4 (patch) | |
| tree | 9c432e679ce270642bbca587f3c9c9a36b348bc1 /indra/newview/lltoolpipette.h | |
| parent | 19b808316b7d4095905baf6ff9f26e3045a86fcd (diff) | |
| parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) | |
Merge branch 'main' of github.com:secondlife/viewer
on promotion of DRTVWR-489 Emoji viewer.
Diffstat (limited to 'indra/newview/lltoolpipette.h')
| -rw-r--r-- | indra/newview/lltoolpipette.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h index 7575d8ad18..2636811c66 100644 --- a/indra/newview/lltoolpipette.h +++ b/indra/newview/lltoolpipette.h @@ -47,10 +47,10 @@ class LLToolPipette virtual ~LLToolPipette(); public: - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleHover(S32 x, S32 y, MASK mask); - virtual BOOL handleToolTip(S32 x, S32 y, MASK mask); + virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) override; + virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask) override; + virtual BOOL handleHover(S32 x, S32 y, MASK mask) override; + virtual BOOL handleToolTip(S32 x, S32 y, MASK mask) override; // Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t; |