diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 18:02:48 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 18:02:48 +0200 |
| commit | faf69f407fa95d9dc19f6d737f606e18ab32d052 (patch) | |
| tree | c19376fa42061e5eee4e55d55cb8cb0a48e26fda /indra/newview/lltoolface.h | |
| parent | 9f0faf5c892bba9703c713a29202a8ac48bfdf8b (diff) | |
| parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) | |
Merge branch 'main' into marchcat/yz-merge
# Conflicts:
# indra/newview/llinventorygallery.cpp
Diffstat (limited to 'indra/newview/lltoolface.h')
| -rw-r--r-- | indra/newview/lltoolface.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h index e4b8ae12b8..7c8ff20480 100644 --- a/indra/newview/lltoolface.h +++ b/indra/newview/lltoolface.h @@ -39,11 +39,11 @@ class LLToolFace virtual ~LLToolFace(); public: - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); - virtual void handleSelect(); - virtual void handleDeselect(); - virtual void render(); // draw face highlights + virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) override; + virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask) override; + virtual void handleSelect() override; + virtual void handleDeselect() override; + virtual void render() override; // draw face highlights static void pickCallback(const LLPickInfo& pick_info); }; |