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/lltoolobjpicker.h | |
| parent | efdda0b93d2dbf28e7722150028476286f0ec623 (diff) | |
| parent | ee8bc528bbf97ee8cc488651fb263b07b5c1c818 (diff) | |
Merge 'release/luau-scripting' into lua-leap for Emoji release.
Diffstat (limited to 'indra/newview/lltoolobjpicker.h')
| -rw-r--r-- | indra/newview/lltoolobjpicker.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h index 5ad9b67e21..a55cd223de 100644 --- a/indra/newview/lltoolobjpicker.h +++ b/indra/newview/lltoolobjpicker.h @@ -38,16 +38,16 @@ class LLToolObjPicker : public LLTool, public LLSingleton<LLToolObjPicker> LLSINGLETON(LLToolObjPicker); 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 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 void handleSelect(); - virtual void handleDeselect(); + virtual void handleSelect() override; + virtual void handleDeselect() override; - virtual void onMouseCaptureLost(); + virtual void onMouseCaptureLost() override; - virtual void setExitCallback(void (*callback)(void *), void *callback_data); + void setExitCallback(void (*callback)(void *), void *callback_data); LLUUID getObjectID() const { return mHitObjectID; } |