summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolobjpicker.h
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-01 18:02:48 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-01 18:02:48 +0200
commitfaf69f407fa95d9dc19f6d737f606e18ab32d052 (patch)
treec19376fa42061e5eee4e55d55cb8cb0a48e26fda /indra/newview/lltoolobjpicker.h
parent9f0faf5c892bba9703c713a29202a8ac48bfdf8b (diff)
parent701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff)
Merge branch 'main' into marchcat/yz-merge
# Conflicts: # indra/newview/llinventorygallery.cpp
Diffstat (limited to 'indra/newview/lltoolobjpicker.h')
-rw-r--r--indra/newview/lltoolobjpicker.h14
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; }