diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-12 21:14:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-12 21:14:45 +0200 |
commit | 6b285674bba145dd70b90a06248ba8dd7fdc474a (patch) | |
tree | 110015e1703b331715fbf7fb1a01639c74c47e62 /indra/newview/lltoolpipette.h | |
parent | 748c0eb50d87a3f8895b25791409ce5e2e4926c4 (diff) | |
parent | eb1ed3896fd82d4f115b2ef6ba742315ad32cc27 (diff) |
Merge main into DRTVWR-600-maint-A
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 8fc7ae5edf..ade06ba78d 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; |