diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-08 11:40:36 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-08 11:40:36 -0500 |
| commit | c12a3c9f5bc085a67ef0fc2c764a9692bcab2b66 (patch) | |
| tree | bad63257eacc0d137c5ea74b153cba600867e353 /indra/newview/lltoolpipette.h | |
| parent | efdda0b93d2dbf28e7722150028476286f0ec623 (diff) | |
| parent | ee8bc528bbf97ee8cc488651fb263b07b5c1c818 (diff) | |
Merge 'release/luau-scripting' into lua-leap for Emoji release.
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; |